diff --git a/feature/cloudfront/sign/go.sum b/feature/cloudfront/sign/go.sum index d5d61042cef..a0cddd7b526 100644 --- a/feature/cloudfront/sign/go.sum +++ b/feature/cloudfront/sign/go.sum @@ -1,3 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= diff --git a/feature/rds/auth/go.sum b/feature/rds/auth/go.sum index d5d61042cef..a0cddd7b526 100644 --- a/feature/rds/auth/go.sum +++ b/feature/rds/auth/go.sum @@ -1,3 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= diff --git a/service/accessanalyzer/endpoints_test.go b/service/accessanalyzer/endpoints_test.go index ea6e0e092d0..4d66b98a477 100644 --- a/service/accessanalyzer/endpoints_test.go +++ b/service/accessanalyzer/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1622,14 +1542,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1681,14 +1599,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1740,14 +1656,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1799,14 +1713,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/accessanalyzer/generated.json b/service/accessanalyzer/generated.json index 964c45312bd..125cd62c362 100644 --- a/service/accessanalyzer/generated.json +++ b/service/accessanalyzer/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/accessanalyzer/go.mod b/service/accessanalyzer/go.mod index a3788b45755..ec7193db4d7 100644 --- a/service/accessanalyzer/go.mod +++ b/service/accessanalyzer/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/accessanalyzer/go.sum b/service/accessanalyzer/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/accessanalyzer/go.sum +++ b/service/accessanalyzer/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/account/endpoints_test.go b/service/account/endpoints_test.go index afe47da2bdf..df621ab0e93 100644 --- a/service/account/endpoints_test.go +++ b/service/account/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -60,14 +60,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -99,14 +97,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -138,14 +134,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -177,14 +171,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -232,14 +224,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -287,14 +277,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -326,14 +314,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -365,14 +351,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -404,14 +388,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -459,14 +441,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -498,14 +478,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -537,14 +515,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -576,14 +552,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -615,14 +589,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -674,14 +646,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -733,14 +703,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -792,14 +760,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -851,14 +817,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -891,14 +855,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -930,14 +892,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/account/generated.json b/service/account/generated.json index b9cd409b746..375a037019e 100644 --- a/service/account/generated.json +++ b/service/account/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/account/go.mod b/service/account/go.mod index 761596fc454..bc0d84d6ee0 100644 --- a/service/account/go.mod +++ b/service/account/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/account/go.sum b/service/account/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/account/go.sum +++ b/service/account/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/acm/endpoints_test.go b/service/acm/endpoints_test.go index 7089db6ee4d..9d88bafc3f5 100644 --- a/service/acm/endpoints_test.go +++ b/service/acm/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1642,14 +1562,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1701,14 +1619,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1760,14 +1676,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/acm/generated.json b/service/acm/generated.json index 95e5c098c7e..ce8521d3418 100644 --- a/service/acm/generated.json +++ b/service/acm/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/acm/go.mod b/service/acm/go.mod index 740b72c1e1b..fb7c42926ea 100644 --- a/service/acm/go.mod +++ b/service/acm/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/acm/go.sum b/service/acm/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/acm/go.sum +++ b/service/acm/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/acmpca/endpoints_test.go b/service/acmpca/endpoints_test.go index d705a4cff0b..18d207cc9ef 100644 --- a/service/acmpca/endpoints_test.go +++ b/service/acmpca/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1642,14 +1562,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1701,14 +1619,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1760,14 +1676,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/acmpca/generated.json b/service/acmpca/generated.json index 339f59d1f53..7b42457ad16 100644 --- a/service/acmpca/generated.json +++ b/service/acmpca/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/acmpca/go.mod b/service/acmpca/go.mod index e4ff719ab84..b1ddab7dee5 100644 --- a/service/acmpca/go.mod +++ b/service/acmpca/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/acmpca/go.sum b/service/acmpca/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/acmpca/go.sum +++ b/service/acmpca/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/alexaforbusiness/endpoints_test.go b/service/alexaforbusiness/endpoints_test.go index ae217480e19..032d1483ad8 100644 --- a/service/alexaforbusiness/endpoints_test.go +++ b/service/alexaforbusiness/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/alexaforbusiness/generated.json b/service/alexaforbusiness/generated.json index cc30f9b0027..5f055a59f0f 100644 --- a/service/alexaforbusiness/generated.json +++ b/service/alexaforbusiness/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/alexaforbusiness/go.mod b/service/alexaforbusiness/go.mod index 27de9aa027b..63d766a2a47 100644 --- a/service/alexaforbusiness/go.mod +++ b/service/alexaforbusiness/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/alexaforbusiness/go.sum b/service/alexaforbusiness/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/alexaforbusiness/go.sum +++ b/service/alexaforbusiness/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/amp/endpoints_test.go b/service/amp/endpoints_test.go index aacbe8029f8..d07d1703505 100644 --- a/service/amp/endpoints_test.go +++ b/service/amp/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -881,14 +839,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -940,14 +896,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -999,14 +953,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1058,14 +1010,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1098,14 +1048,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/amp/generated.json b/service/amp/generated.json index 5b019a883bd..cbd72ebc3f1 100644 --- a/service/amp/generated.json +++ b/service/amp/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/amp/go.mod b/service/amp/go.mod index 4bf3cdf2624..739dbea4f2c 100644 --- a/service/amp/go.mod +++ b/service/amp/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/amp/go.sum b/service/amp/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/amp/go.sum +++ b/service/amp/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/amplify/endpoints_test.go b/service/amplify/endpoints_test.go index d579c6af166..c53de27babf 100644 --- a/service/amplify/endpoints_test.go +++ b/service/amplify/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1232,14 +1172,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1291,14 +1229,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1350,14 +1286,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1409,14 +1343,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1449,14 +1381,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1488,14 +1418,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/amplify/generated.json b/service/amplify/generated.json index 3bf11834e4d..cc334686088 100644 --- a/service/amplify/generated.json +++ b/service/amplify/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/amplify/go.mod b/service/amplify/go.mod index a5188033c3d..2656eedf147 100644 --- a/service/amplify/go.mod +++ b/service/amplify/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/amplify/go.sum b/service/amplify/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/amplify/go.sum +++ b/service/amplify/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/amplifybackend/endpoints_test.go b/service/amplifybackend/endpoints_test.go index e13a49755d6..2c23911131c 100644 --- a/service/amplifybackend/endpoints_test.go +++ b/service/amplifybackend/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1154,14 +1098,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1213,14 +1155,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1272,14 +1212,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1331,14 +1269,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1410,14 +1344,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/amplifybackend/generated.json b/service/amplifybackend/generated.json index d7c77c19387..01d8bcfe1c8 100644 --- a/service/amplifybackend/generated.json +++ b/service/amplifybackend/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/amplifybackend/go.mod b/service/amplifybackend/go.mod index deb3ddb52b1..491f3962646 100644 --- a/service/amplifybackend/go.mod +++ b/service/amplifybackend/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/amplifybackend/go.sum b/service/amplifybackend/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/amplifybackend/go.sum +++ b/service/amplifybackend/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/amplifyuibuilder/endpoints_test.go b/service/amplifyuibuilder/endpoints_test.go index 603988f903a..792eb97512b 100644 --- a/service/amplifyuibuilder/endpoints_test.go +++ b/service/amplifyuibuilder/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1154,14 +1098,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1213,14 +1155,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1272,14 +1212,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1331,14 +1269,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1410,14 +1344,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/amplifyuibuilder/generated.json b/service/amplifyuibuilder/generated.json index 70371391c45..d66e1483e15 100644 --- a/service/amplifyuibuilder/generated.json +++ b/service/amplifyuibuilder/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/amplifyuibuilder/go.mod b/service/amplifyuibuilder/go.mod index d9009fd7882..0ccad818e6a 100644 --- a/service/amplifyuibuilder/go.mod +++ b/service/amplifyuibuilder/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/amplifyuibuilder/go.sum b/service/amplifyuibuilder/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/amplifyuibuilder/go.sum +++ b/service/amplifyuibuilder/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/apigateway/endpoints_test.go b/service/apigateway/endpoints_test.go index 0ba513f7ff3..f5844ee2d60 100644 --- a/service/apigateway/endpoints_test.go +++ b/service/apigateway/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1427,14 +1357,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1506,14 +1434,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1565,14 +1491,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1605,14 +1529,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/apigateway/generated.json b/service/apigateway/generated.json index d9f8a6a0d98..44589cfac69 100644 --- a/service/apigateway/generated.json +++ b/service/apigateway/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/apigateway/go.mod b/service/apigateway/go.mod index 09ac38427a1..ea76d9e3bbb 100644 --- a/service/apigateway/go.mod +++ b/service/apigateway/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/apigateway/go.sum b/service/apigateway/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/apigateway/go.sum +++ b/service/apigateway/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/apigatewaymanagementapi/endpoints_test.go b/service/apigatewaymanagementapi/endpoints_test.go index c44f7cd2d1a..86c657cd9cd 100644 --- a/service/apigatewaymanagementapi/endpoints_test.go +++ b/service/apigatewaymanagementapi/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/apigatewaymanagementapi/generated.json b/service/apigatewaymanagementapi/generated.json index 4603b3f9b66..5653ed6499a 100644 --- a/service/apigatewaymanagementapi/generated.json +++ b/service/apigatewaymanagementapi/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/apigatewaymanagementapi/go.mod b/service/apigatewaymanagementapi/go.mod index 2008fb008da..3f5e6243092 100644 --- a/service/apigatewaymanagementapi/go.mod +++ b/service/apigatewaymanagementapi/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/apigatewaymanagementapi/go.sum b/service/apigatewaymanagementapi/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/apigatewaymanagementapi/go.sum +++ b/service/apigatewaymanagementapi/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/apigatewayv2/endpoints_test.go b/service/apigatewayv2/endpoints_test.go index 708b049a3c8..c7eef9b88dc 100644 --- a/service/apigatewayv2/endpoints_test.go +++ b/service/apigatewayv2/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1427,14 +1357,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1506,14 +1434,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1565,14 +1491,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1605,14 +1529,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/apigatewayv2/generated.json b/service/apigatewayv2/generated.json index ecced8c5564..81edc5177c1 100644 --- a/service/apigatewayv2/generated.json +++ b/service/apigatewayv2/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/apigatewayv2/go.mod b/service/apigatewayv2/go.mod index 1fd5adfb518..645c3a7efc8 100644 --- a/service/apigatewayv2/go.mod +++ b/service/apigatewayv2/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/apigatewayv2/go.sum b/service/apigatewayv2/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/apigatewayv2/go.sum +++ b/service/apigatewayv2/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/appconfig/endpoints_test.go b/service/appconfig/endpoints_test.go index 0d8e0c91d80..2a06676e149 100644 --- a/service/appconfig/endpoints_test.go +++ b/service/appconfig/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1544,14 +1468,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1603,14 +1525,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1662,14 +1582,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1722,14 +1640,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1761,14 +1677,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/appconfig/generated.json b/service/appconfig/generated.json index f1d70aca8d5..c5fa8797f4e 100644 --- a/service/appconfig/generated.json +++ b/service/appconfig/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/appconfig/go.mod b/service/appconfig/go.mod index 9c290e43300..ef3c483c3a6 100644 --- a/service/appconfig/go.mod +++ b/service/appconfig/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appconfig/go.sum b/service/appconfig/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/appconfig/go.sum +++ b/service/appconfig/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/appconfigdata/endpoints_test.go b/service/appconfigdata/endpoints_test.go index ee5f39f9747..2a630f10eec 100644 --- a/service/appconfigdata/endpoints_test.go +++ b/service/appconfigdata/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1427,14 +1357,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1486,14 +1414,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1545,14 +1471,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1604,14 +1528,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/appconfigdata/generated.json b/service/appconfigdata/generated.json index 2c1ac29806e..ef4f5dcae2b 100644 --- a/service/appconfigdata/generated.json +++ b/service/appconfigdata/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/appconfigdata/go.mod b/service/appconfigdata/go.mod index 3a12842a6a9..2786611d1fc 100644 --- a/service/appconfigdata/go.mod +++ b/service/appconfigdata/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appconfigdata/go.sum b/service/appconfigdata/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/appconfigdata/go.sum +++ b/service/appconfigdata/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/appfabric/endpoints_test.go b/service/appfabric/endpoints_test.go index a51886d4138..155057384bf 100644 --- a/service/appfabric/endpoints_test.go +++ b/service/appfabric/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/appfabric/generated.json b/service/appfabric/generated.json index e2f8be327a1..a158b942755 100644 --- a/service/appfabric/generated.json +++ b/service/appfabric/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/appfabric/go.mod b/service/appfabric/go.mod index 2f7ca7fe770..1f0860cf6dd 100644 --- a/service/appfabric/go.mod +++ b/service/appfabric/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appfabric/go.sum b/service/appfabric/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/appfabric/go.sum +++ b/service/appfabric/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/appflow/endpoints_test.go b/service/appflow/endpoints_test.go index d46fdaa93d9..ab63e98fb84 100644 --- a/service/appflow/endpoints_test.go +++ b/service/appflow/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1115,14 +1061,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1174,14 +1118,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1233,14 +1175,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1292,14 +1232,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/appflow/generated.json b/service/appflow/generated.json index b16bf0c8b66..021efaadf23 100644 --- a/service/appflow/generated.json +++ b/service/appflow/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/appflow/go.mod b/service/appflow/go.mod index cab484b6c48..68d498b1cbd 100644 --- a/service/appflow/go.mod +++ b/service/appflow/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appflow/go.sum b/service/appflow/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/appflow/go.sum +++ b/service/appflow/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/appintegrations/endpoints_test.go b/service/appintegrations/endpoints_test.go index cdbde4f4958..34db968de45 100644 --- a/service/appintegrations/endpoints_test.go +++ b/service/appintegrations/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -881,14 +839,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -940,14 +896,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -999,14 +953,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1058,14 +1010,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1098,14 +1048,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/appintegrations/generated.json b/service/appintegrations/generated.json index 1611e141ffa..b950b01d348 100644 --- a/service/appintegrations/generated.json +++ b/service/appintegrations/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/appintegrations/go.mod b/service/appintegrations/go.mod index bb414065f89..fcc6c20f6ae 100644 --- a/service/appintegrations/go.mod +++ b/service/appintegrations/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appintegrations/go.sum b/service/appintegrations/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/appintegrations/go.sum +++ b/service/appintegrations/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/applicationautoscaling/endpoints_test.go b/service/applicationautoscaling/endpoints_test.go index abf199ae6a0..2aab3112059 100644 --- a/service/applicationautoscaling/endpoints_test.go +++ b/service/applicationautoscaling/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1544,14 +1468,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1603,14 +1525,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1662,14 +1582,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1722,14 +1640,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1761,14 +1677,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/applicationautoscaling/generated.json b/service/applicationautoscaling/generated.json index 18a106dcb05..881092eed39 100644 --- a/service/applicationautoscaling/generated.json +++ b/service/applicationautoscaling/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/applicationautoscaling/go.mod b/service/applicationautoscaling/go.mod index c4391052d56..553d4a258a7 100644 --- a/service/applicationautoscaling/go.mod +++ b/service/applicationautoscaling/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/applicationautoscaling/go.sum b/service/applicationautoscaling/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/applicationautoscaling/go.sum +++ b/service/applicationautoscaling/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/applicationcostprofiler/endpoints_test.go b/service/applicationcostprofiler/endpoints_test.go index cac31023785..f0d0ecaa295 100644 --- a/service/applicationcostprofiler/endpoints_test.go +++ b/service/applicationcostprofiler/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/applicationcostprofiler/generated.json b/service/applicationcostprofiler/generated.json index 8ac0e4b1e21..672852b65d3 100644 --- a/service/applicationcostprofiler/generated.json +++ b/service/applicationcostprofiler/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/applicationcostprofiler/go.mod b/service/applicationcostprofiler/go.mod index cd69ae5bf2b..4538f5abd0a 100644 --- a/service/applicationcostprofiler/go.mod +++ b/service/applicationcostprofiler/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/applicationcostprofiler/go.sum b/service/applicationcostprofiler/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/applicationcostprofiler/go.sum +++ b/service/applicationcostprofiler/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/applicationdiscoveryservice/endpoints_test.go b/service/applicationdiscoveryservice/endpoints_test.go index 9967184c732..bd000cfa737 100644 --- a/service/applicationdiscoveryservice/endpoints_test.go +++ b/service/applicationdiscoveryservice/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -764,14 +728,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -823,14 +785,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -882,14 +842,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -941,14 +899,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1020,14 +974,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/applicationdiscoveryservice/generated.json b/service/applicationdiscoveryservice/generated.json index 81c28ad0d9f..655a981e608 100644 --- a/service/applicationdiscoveryservice/generated.json +++ b/service/applicationdiscoveryservice/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/applicationdiscoveryservice/go.mod b/service/applicationdiscoveryservice/go.mod index d23fd792aab..9821b9a3411 100644 --- a/service/applicationdiscoveryservice/go.mod +++ b/service/applicationdiscoveryservice/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/applicationdiscoveryservice/go.sum b/service/applicationdiscoveryservice/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/applicationdiscoveryservice/go.sum +++ b/service/applicationdiscoveryservice/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/applicationinsights/endpoints_test.go b/service/applicationinsights/endpoints_test.go index 0af962bece9..e0270262fb5 100644 --- a/service/applicationinsights/endpoints_test.go +++ b/service/applicationinsights/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1388,14 +1320,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1447,14 +1377,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1506,14 +1434,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1565,14 +1491,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1605,14 +1529,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/applicationinsights/generated.json b/service/applicationinsights/generated.json index a188c0cfb2e..a20602f163d 100644 --- a/service/applicationinsights/generated.json +++ b/service/applicationinsights/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/applicationinsights/go.mod b/service/applicationinsights/go.mod index e6d76bfc658..e4479a9328c 100644 --- a/service/applicationinsights/go.mod +++ b/service/applicationinsights/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/applicationinsights/go.sum b/service/applicationinsights/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/applicationinsights/go.sum +++ b/service/applicationinsights/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/appmesh/endpoints_test.go b/service/appmesh/endpoints_test.go index bb1b4932ca9..4a627cc11a5 100644 --- a/service/appmesh/endpoints_test.go +++ b/service/appmesh/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1641,14 +1559,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1680,14 +1596,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1719,14 +1633,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1758,14 +1670,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1797,14 +1707,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1836,14 +1744,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1875,14 +1781,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1914,14 +1818,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1953,14 +1855,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1992,14 +1892,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2031,14 +1929,12 @@ func TestEndpointCase51(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2090,14 +1986,12 @@ func TestEndpointCase53(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2149,14 +2043,12 @@ func TestEndpointCase55(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2208,14 +2100,12 @@ func TestEndpointCase57(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2267,14 +2157,12 @@ func TestEndpointCase59(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2307,14 +2195,12 @@ func TestEndpointCase60(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2346,14 +2232,12 @@ func TestEndpointCase61(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/appmesh/generated.json b/service/appmesh/generated.json index 61cb603a28a..7de5def125c 100644 --- a/service/appmesh/generated.json +++ b/service/appmesh/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/appmesh/go.mod b/service/appmesh/go.mod index be93407de5d..ff0a376bd88 100644 --- a/service/appmesh/go.mod +++ b/service/appmesh/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appmesh/go.sum b/service/appmesh/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/appmesh/go.sum +++ b/service/appmesh/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/apprunner/endpoints_test.go b/service/apprunner/endpoints_test.go index 10fc5fd5d4a..c87d510367d 100644 --- a/service/apprunner/endpoints_test.go +++ b/service/apprunner/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -764,14 +728,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -823,14 +785,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -882,14 +842,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -941,14 +899,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1020,14 +974,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/apprunner/generated.json b/service/apprunner/generated.json index 05d734c07fa..a8affff1cf2 100644 --- a/service/apprunner/generated.json +++ b/service/apprunner/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/apprunner/go.mod b/service/apprunner/go.mod index 5340e9d9498..c49ff5dd9fc 100644 --- a/service/apprunner/go.mod +++ b/service/apprunner/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/apprunner/go.sum b/service/apprunner/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/apprunner/go.sum +++ b/service/apprunner/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/appstream/endpoints_test.go b/service/appstream/endpoints_test.go index 737f2900ccb..5ef9565084a 100644 --- a/service/appstream/endpoints_test.go +++ b/service/appstream/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1076,14 +1024,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1135,14 +1081,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1194,14 +1138,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1253,14 +1195,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1293,14 +1233,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/appstream/generated.json b/service/appstream/generated.json index d2c873f903b..be54abbca6c 100644 --- a/service/appstream/generated.json +++ b/service/appstream/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/appstream/go.mod b/service/appstream/go.mod index 3075cfedfba..a5e2fc57b3b 100644 --- a/service/appstream/go.mod +++ b/service/appstream/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/appstream/go.sum b/service/appstream/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/appstream/go.sum +++ b/service/appstream/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/appsync/endpoints_test.go b/service/appsync/endpoints_test.go index 130ad62af50..fba97781bc6 100644 --- a/service/appsync/endpoints_test.go +++ b/service/appsync/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1310,14 +1246,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1369,14 +1303,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1428,14 +1360,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1487,14 +1417,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1527,14 +1455,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/appsync/generated.json b/service/appsync/generated.json index d803bcdb05f..c5768be707d 100644 --- a/service/appsync/generated.json +++ b/service/appsync/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/appsync/go.mod b/service/appsync/go.mod index 4a5ad79eda5..135799bf110 100644 --- a/service/appsync/go.mod +++ b/service/appsync/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appsync/go.sum b/service/appsync/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/appsync/go.sum +++ b/service/appsync/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/arczonalshift/endpoints_test.go b/service/arczonalshift/endpoints_test.go index c2374ff008e..e29ea4cb15b 100644 --- a/service/arczonalshift/endpoints_test.go +++ b/service/arczonalshift/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/arczonalshift/generated.json b/service/arczonalshift/generated.json index 15cef948fa3..8e2dea7510f 100644 --- a/service/arczonalshift/generated.json +++ b/service/arczonalshift/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/arczonalshift/go.mod b/service/arczonalshift/go.mod index 3bedb6ec849..25a48edcd87 100644 --- a/service/arczonalshift/go.mod +++ b/service/arczonalshift/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/arczonalshift/go.sum b/service/arczonalshift/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/arczonalshift/go.sum +++ b/service/arczonalshift/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/artifact/endpoints_test.go b/service/artifact/endpoints_test.go index 9ed3320e44f..b207b020920 100644 --- a/service/artifact/endpoints_test.go +++ b/service/artifact/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/artifact/generated.json b/service/artifact/generated.json index c6a0a052b7e..ed3efd1fc03 100644 --- a/service/artifact/generated.json +++ b/service/artifact/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/artifact/go.mod b/service/artifact/go.mod index d7540f856d3..7775abce5c1 100644 --- a/service/artifact/go.mod +++ b/service/artifact/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/artifact/go.sum b/service/artifact/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/artifact/go.sum +++ b/service/artifact/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/athena/endpoints_test.go b/service/athena/endpoints_test.go index a978c16bd56..9e3c00f12b5 100644 --- a/service/athena/endpoints_test.go +++ b/service/athena/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1544,14 +1468,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1603,14 +1525,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1662,14 +1582,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1721,14 +1639,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1761,14 +1677,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/athena/generated.json b/service/athena/generated.json index 2b6aadbf7b4..ea1a5a484a9 100644 --- a/service/athena/generated.json +++ b/service/athena/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/athena/go.mod b/service/athena/go.mod index 3e5047ec944..954a352b931 100644 --- a/service/athena/go.mod +++ b/service/athena/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/athena/go.sum b/service/athena/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/athena/go.sum +++ b/service/athena/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/auditmanager/endpoints_test.go b/service/auditmanager/endpoints_test.go index 8a78ef93bed..27b45f14399 100644 --- a/service/auditmanager/endpoints_test.go +++ b/service/auditmanager/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -959,14 +913,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1018,14 +970,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1077,14 +1027,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1136,14 +1084,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1215,14 +1159,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/auditmanager/generated.json b/service/auditmanager/generated.json index 6054c3aab85..e661194810d 100644 --- a/service/auditmanager/generated.json +++ b/service/auditmanager/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/auditmanager/go.mod b/service/auditmanager/go.mod index 201616925bb..47fb3d52396 100644 --- a/service/auditmanager/go.mod +++ b/service/auditmanager/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/auditmanager/go.sum b/service/auditmanager/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/auditmanager/go.sum +++ b/service/auditmanager/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/autoscaling/endpoints_test.go b/service/autoscaling/endpoints_test.go index 281052960fd..719e10cd08d 100644 --- a/service/autoscaling/endpoints_test.go +++ b/service/autoscaling/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1505,14 +1431,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1564,14 +1488,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1623,14 +1545,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1722,14 +1640,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/autoscaling/generated.json b/service/autoscaling/generated.json index c6dd1f2473e..eb092498430 100644 --- a/service/autoscaling/generated.json +++ b/service/autoscaling/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/autoscaling/go.mod b/service/autoscaling/go.mod index f59c3b97e64..6b86093489a 100644 --- a/service/autoscaling/go.mod +++ b/service/autoscaling/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/autoscaling/go.sum b/service/autoscaling/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/autoscaling/go.sum +++ b/service/autoscaling/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/autoscalingplans/endpoints_test.go b/service/autoscalingplans/endpoints_test.go index 942ab3b2658..526d55d130c 100644 --- a/service/autoscalingplans/endpoints_test.go +++ b/service/autoscalingplans/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1427,14 +1357,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1486,14 +1414,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1545,14 +1471,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1604,14 +1528,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/autoscalingplans/generated.json b/service/autoscalingplans/generated.json index 9b1fd7c24ab..f65917c6d85 100644 --- a/service/autoscalingplans/generated.json +++ b/service/autoscalingplans/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/autoscalingplans/go.mod b/service/autoscalingplans/go.mod index 4b319d127c8..c52c9636ec6 100644 --- a/service/autoscalingplans/go.mod +++ b/service/autoscalingplans/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/autoscalingplans/go.sum b/service/autoscalingplans/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/autoscalingplans/go.sum +++ b/service/autoscalingplans/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/b2bi/endpoints_test.go b/service/b2bi/endpoints_test.go index 66f6aa42a9a..eff82edba0a 100644 --- a/service/b2bi/endpoints_test.go +++ b/service/b2bi/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/b2bi/generated.json b/service/b2bi/generated.json index 85eb06ab5fc..bdfa5d56edc 100644 --- a/service/b2bi/generated.json +++ b/service/b2bi/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/b2bi/go.mod b/service/b2bi/go.mod index 29e5314a697..51efa08661a 100644 --- a/service/b2bi/go.mod +++ b/service/b2bi/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/b2bi/go.sum b/service/b2bi/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/b2bi/go.sum +++ b/service/b2bi/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/backup/endpoints_test.go b/service/backup/endpoints_test.go index 321491c725e..eceadb44a31 100644 --- a/service/backup/endpoints_test.go +++ b/service/backup/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1427,14 +1357,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1486,14 +1414,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1545,14 +1471,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1604,14 +1528,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/backup/generated.json b/service/backup/generated.json index 66ba2bd7cfa..0ac24e71a01 100644 --- a/service/backup/generated.json +++ b/service/backup/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/backup/go.mod b/service/backup/go.mod index 531246f77dc..5997f99ee05 100644 --- a/service/backup/go.mod +++ b/service/backup/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/backup/go.sum b/service/backup/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/backup/go.sum +++ b/service/backup/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/backupgateway/endpoints_test.go b/service/backupgateway/endpoints_test.go index a98dfedc65e..0f60bcca691 100644 --- a/service/backupgateway/endpoints_test.go +++ b/service/backupgateway/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1349,14 +1283,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1408,14 +1340,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1467,14 +1397,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1526,14 +1454,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1605,14 +1529,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/backupgateway/generated.json b/service/backupgateway/generated.json index 6c5bf0c957f..883e9c567cd 100644 --- a/service/backupgateway/generated.json +++ b/service/backupgateway/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/backupgateway/go.mod b/service/backupgateway/go.mod index 048be23605d..b7b7313b77b 100644 --- a/service/backupgateway/go.mod +++ b/service/backupgateway/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/backupgateway/go.sum b/service/backupgateway/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/backupgateway/go.sum +++ b/service/backupgateway/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/backupstorage/endpoints_test.go b/service/backupstorage/endpoints_test.go index 9a88f294c76..572c790007c 100644 --- a/service/backupstorage/endpoints_test.go +++ b/service/backupstorage/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/backupstorage/generated.json b/service/backupstorage/generated.json index ad8bdda43e3..f5a0698df86 100644 --- a/service/backupstorage/generated.json +++ b/service/backupstorage/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/backupstorage/go.mod b/service/backupstorage/go.mod index a983c802d71..4bc760d686d 100644 --- a/service/backupstorage/go.mod +++ b/service/backupstorage/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/backupstorage/go.sum b/service/backupstorage/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/backupstorage/go.sum +++ b/service/backupstorage/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/batch/endpoints_test.go b/service/batch/endpoints_test.go index d04c4fa3f3b..1a081277e21 100644 --- a/service/batch/endpoints_test.go +++ b/service/batch/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1642,14 +1562,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1701,14 +1619,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1760,14 +1676,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/batch/generated.json b/service/batch/generated.json index daf0f584a56..5ad7fc7ca31 100644 --- a/service/batch/generated.json +++ b/service/batch/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/batch/go.mod b/service/batch/go.mod index 6a3cd0186a6..f2771629b56 100644 --- a/service/batch/go.mod +++ b/service/batch/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/batch/go.sum b/service/batch/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/batch/go.sum +++ b/service/batch/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/bcmdataexports/endpoints_test.go b/service/bcmdataexports/endpoints_test.go index d76ede7892b..2970f762175 100644 --- a/service/bcmdataexports/endpoints_test.go +++ b/service/bcmdataexports/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -59,14 +59,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -97,14 +95,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -151,14 +147,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -189,14 +183,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -227,14 +219,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -265,14 +255,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -303,14 +291,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -342,14 +328,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -380,14 +364,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/bcmdataexports/generated.json b/service/bcmdataexports/generated.json index a77af624dd9..199c5b406fe 100644 --- a/service/bcmdataexports/generated.json +++ b/service/bcmdataexports/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/bcmdataexports/go.mod b/service/bcmdataexports/go.mod index f1041740394..20e2fdbe937 100644 --- a/service/bcmdataexports/go.mod +++ b/service/bcmdataexports/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/bcmdataexports/go.sum b/service/bcmdataexports/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/bcmdataexports/go.sum +++ b/service/bcmdataexports/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/bedrock/endpoints_test.go b/service/bedrock/endpoints_test.go index 49d193c3c9b..4a8a7af3d29 100644 --- a/service/bedrock/endpoints_test.go +++ b/service/bedrock/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/bedrock/generated.json b/service/bedrock/generated.json index 49a4e8391f2..c5bf9680b36 100644 --- a/service/bedrock/generated.json +++ b/service/bedrock/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/bedrock/go.mod b/service/bedrock/go.mod index b68f668c52b..a233e323b99 100644 --- a/service/bedrock/go.mod +++ b/service/bedrock/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/bedrock/go.sum b/service/bedrock/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/bedrock/go.sum +++ b/service/bedrock/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/bedrockagent/endpoints_test.go b/service/bedrockagent/endpoints_test.go index f8100d4ae1f..c6be03e98b7 100644 --- a/service/bedrockagent/endpoints_test.go +++ b/service/bedrockagent/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/bedrockagent/generated.json b/service/bedrockagent/generated.json index 736999db808..c97087f4d85 100644 --- a/service/bedrockagent/generated.json +++ b/service/bedrockagent/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/bedrockagent/go.mod b/service/bedrockagent/go.mod index bf7af7fb7cd..e96f4019910 100644 --- a/service/bedrockagent/go.mod +++ b/service/bedrockagent/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/bedrockagent/go.sum b/service/bedrockagent/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/bedrockagent/go.sum +++ b/service/bedrockagent/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/bedrockagentruntime/endpoints_test.go b/service/bedrockagentruntime/endpoints_test.go index e7a5e0a26ec..4763bb69b93 100644 --- a/service/bedrockagentruntime/endpoints_test.go +++ b/service/bedrockagentruntime/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/bedrockagentruntime/generated.json b/service/bedrockagentruntime/generated.json index ba8a77c16a7..40b89b79d48 100644 --- a/service/bedrockagentruntime/generated.json +++ b/service/bedrockagentruntime/generated.json @@ -4,8 +4,7 @@ "github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/bedrockagentruntime/go.mod b/service/bedrockagentruntime/go.mod index c847728a721..6edf7c432f9 100644 --- a/service/bedrockagentruntime/go.mod +++ b/service/bedrockagentruntime/go.mod @@ -8,7 +8,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/bedrockagentruntime/go.sum b/service/bedrockagentruntime/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/bedrockagentruntime/go.sum +++ b/service/bedrockagentruntime/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/bedrockruntime/endpoints_test.go b/service/bedrockruntime/endpoints_test.go index 5f5c4a3f4f8..71db0387de5 100644 --- a/service/bedrockruntime/endpoints_test.go +++ b/service/bedrockruntime/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/bedrockruntime/generated.json b/service/bedrockruntime/generated.json index d79c12ab1f3..52dba7f5a65 100644 --- a/service/bedrockruntime/generated.json +++ b/service/bedrockruntime/generated.json @@ -4,8 +4,7 @@ "github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/bedrockruntime/go.mod b/service/bedrockruntime/go.mod index 92aee65b785..0434a66f5ca 100644 --- a/service/bedrockruntime/go.mod +++ b/service/bedrockruntime/go.mod @@ -8,7 +8,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/bedrockruntime/go.sum b/service/bedrockruntime/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/bedrockruntime/go.sum +++ b/service/bedrockruntime/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/billingconductor/endpoints_test.go b/service/billingconductor/endpoints_test.go index 3836e2eb266..39a93bbe228 100644 --- a/service/billingconductor/endpoints_test.go +++ b/service/billingconductor/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -60,14 +60,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -99,14 +97,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -138,14 +134,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -177,14 +171,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -232,14 +224,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -271,14 +261,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -310,14 +298,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -349,14 +335,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -388,14 +372,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -427,14 +409,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -466,14 +446,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -505,14 +483,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -544,14 +520,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -603,14 +577,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -662,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -721,14 +691,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -780,14 +748,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -820,14 +786,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -859,14 +823,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/billingconductor/generated.json b/service/billingconductor/generated.json index 3364b4c74fe..45b1e775f14 100644 --- a/service/billingconductor/generated.json +++ b/service/billingconductor/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/billingconductor/go.mod b/service/billingconductor/go.mod index 8f5d7d79420..e240b050623 100644 --- a/service/billingconductor/go.mod +++ b/service/billingconductor/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/billingconductor/go.sum b/service/billingconductor/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/billingconductor/go.sum +++ b/service/billingconductor/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/braket/endpoints_test.go b/service/braket/endpoints_test.go index db36402c807..00bfc4446ab 100644 --- a/service/braket/endpoints_test.go +++ b/service/braket/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -647,14 +617,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -706,14 +674,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -765,14 +731,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -824,14 +788,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -864,14 +826,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -903,14 +863,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/braket/generated.json b/service/braket/generated.json index 013089f1055..807dbdbe478 100644 --- a/service/braket/generated.json +++ b/service/braket/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/braket/go.mod b/service/braket/go.mod index 3f3babd3df8..b93d3cd00c9 100644 --- a/service/braket/go.mod +++ b/service/braket/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/braket/go.sum b/service/braket/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/braket/go.sum +++ b/service/braket/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/budgets/endpoints_test.go b/service/budgets/endpoints_test.go index 4eedf1ac562..f8d8ebb9b84 100644 --- a/service/budgets/endpoints_test.go +++ b/service/budgets/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -60,14 +60,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -99,14 +97,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -138,14 +134,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -177,14 +171,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -232,14 +224,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -287,14 +277,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -326,14 +314,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -365,14 +351,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -404,14 +388,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -459,14 +441,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -498,14 +478,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -537,14 +515,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -576,14 +552,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -615,14 +589,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -674,14 +646,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -733,14 +703,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -792,14 +760,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -851,14 +817,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -891,14 +855,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -930,14 +892,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/budgets/generated.json b/service/budgets/generated.json index 09dac2978fc..d3a262ed196 100644 --- a/service/budgets/generated.json +++ b/service/budgets/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/budgets/go.mod b/service/budgets/go.mod index e04bfc98e52..76f026e6838 100644 --- a/service/budgets/go.mod +++ b/service/budgets/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/budgets/go.sum b/service/budgets/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/budgets/go.sum +++ b/service/budgets/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/chatbot/endpoints_test.go b/service/chatbot/endpoints_test.go index f5ade04bc4e..781abfdc97f 100644 --- a/service/chatbot/endpoints_test.go +++ b/service/chatbot/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/chatbot/generated.json b/service/chatbot/generated.json index f059efdcfad..86a26979465 100644 --- a/service/chatbot/generated.json +++ b/service/chatbot/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/chatbot/go.mod b/service/chatbot/go.mod index ee95f32eefb..c313ea86c22 100644 --- a/service/chatbot/go.mod +++ b/service/chatbot/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/chatbot/go.sum b/service/chatbot/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/chatbot/go.sum +++ b/service/chatbot/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/chime/endpoints_test.go b/service/chime/endpoints_test.go index 2471dbbc8ab..dc5caa5fd41 100644 --- a/service/chime/endpoints_test.go +++ b/service/chime/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -60,14 +60,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -99,14 +97,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -138,14 +134,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -177,14 +171,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -232,14 +224,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -271,14 +261,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -310,14 +298,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -349,14 +335,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -388,14 +372,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -427,14 +409,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -466,14 +446,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -505,14 +483,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -544,14 +520,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -603,14 +577,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -662,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -721,14 +691,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -780,14 +748,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -820,14 +786,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -859,14 +823,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/chime/generated.json b/service/chime/generated.json index 0ca06c87810..33846833ee6 100644 --- a/service/chime/generated.json +++ b/service/chime/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/chime/go.mod b/service/chime/go.mod index 9b31d228b9c..eb983a37c06 100644 --- a/service/chime/go.mod +++ b/service/chime/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/chime/go.sum b/service/chime/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/chime/go.sum +++ b/service/chime/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/chimesdkidentity/endpoints_test.go b/service/chimesdkidentity/endpoints_test.go index d4745f22f58..e8e5b014297 100644 --- a/service/chimesdkidentity/endpoints_test.go +++ b/service/chimesdkidentity/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -569,14 +543,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -628,14 +600,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -687,14 +657,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -746,14 +714,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/chimesdkidentity/generated.json b/service/chimesdkidentity/generated.json index 41dfc6a65a8..d428f7fbee7 100644 --- a/service/chimesdkidentity/generated.json +++ b/service/chimesdkidentity/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/chimesdkidentity/go.mod b/service/chimesdkidentity/go.mod index 1d1fd7e7397..959637f44bf 100644 --- a/service/chimesdkidentity/go.mod +++ b/service/chimesdkidentity/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/chimesdkidentity/go.sum b/service/chimesdkidentity/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/chimesdkidentity/go.sum +++ b/service/chimesdkidentity/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/chimesdkmediapipelines/endpoints_test.go b/service/chimesdkmediapipelines/endpoints_test.go index 8e27353a4cb..6ddffc5fd5a 100644 --- a/service/chimesdkmediapipelines/endpoints_test.go +++ b/service/chimesdkmediapipelines/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -686,14 +654,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -745,14 +711,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -804,14 +768,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -863,14 +825,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -903,14 +863,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +900,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/chimesdkmediapipelines/generated.json b/service/chimesdkmediapipelines/generated.json index 3368ce1a833..a4dfbe6bd9f 100644 --- a/service/chimesdkmediapipelines/generated.json +++ b/service/chimesdkmediapipelines/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/chimesdkmediapipelines/go.mod b/service/chimesdkmediapipelines/go.mod index 31b1c0a549f..0b510b83a80 100644 --- a/service/chimesdkmediapipelines/go.mod +++ b/service/chimesdkmediapipelines/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/chimesdkmediapipelines/go.sum b/service/chimesdkmediapipelines/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/chimesdkmediapipelines/go.sum +++ b/service/chimesdkmediapipelines/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/chimesdkmeetings/endpoints_test.go b/service/chimesdkmeetings/endpoints_test.go index bf2dba8c3a0..a2b0db4d2d6 100644 --- a/service/chimesdkmeetings/endpoints_test.go +++ b/service/chimesdkmeetings/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -764,14 +728,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -823,14 +785,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -882,14 +842,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -941,14 +899,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1020,14 +974,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/chimesdkmeetings/generated.json b/service/chimesdkmeetings/generated.json index 856cf42876f..b05c8444204 100644 --- a/service/chimesdkmeetings/generated.json +++ b/service/chimesdkmeetings/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/chimesdkmeetings/go.mod b/service/chimesdkmeetings/go.mod index 78a0586ece6..ac1a7ca2d6e 100644 --- a/service/chimesdkmeetings/go.mod +++ b/service/chimesdkmeetings/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/chimesdkmeetings/go.sum b/service/chimesdkmeetings/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/chimesdkmeetings/go.sum +++ b/service/chimesdkmeetings/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/chimesdkmessaging/endpoints_test.go b/service/chimesdkmessaging/endpoints_test.go index d8d1f3d0b60..d9c6900a5e6 100644 --- a/service/chimesdkmessaging/endpoints_test.go +++ b/service/chimesdkmessaging/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -569,14 +543,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -628,14 +600,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -687,14 +657,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -746,14 +714,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/chimesdkmessaging/generated.json b/service/chimesdkmessaging/generated.json index 49858bbf5b7..9a3d6546c1e 100644 --- a/service/chimesdkmessaging/generated.json +++ b/service/chimesdkmessaging/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/chimesdkmessaging/go.mod b/service/chimesdkmessaging/go.mod index 064dc7b87e4..0c7344db5af 100644 --- a/service/chimesdkmessaging/go.mod +++ b/service/chimesdkmessaging/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/chimesdkmessaging/go.sum b/service/chimesdkmessaging/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/chimesdkmessaging/go.sum +++ b/service/chimesdkmessaging/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/chimesdkvoice/endpoints_test.go b/service/chimesdkvoice/endpoints_test.go index 942083e4298..962293bae4c 100644 --- a/service/chimesdkvoice/endpoints_test.go +++ b/service/chimesdkvoice/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/chimesdkvoice/generated.json b/service/chimesdkvoice/generated.json index 982f65204c7..3a05aa12a9b 100644 --- a/service/chimesdkvoice/generated.json +++ b/service/chimesdkvoice/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/chimesdkvoice/go.mod b/service/chimesdkvoice/go.mod index bff6767011f..8f7b651f30b 100644 --- a/service/chimesdkvoice/go.mod +++ b/service/chimesdkvoice/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/chimesdkvoice/go.sum b/service/chimesdkvoice/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/chimesdkvoice/go.sum +++ b/service/chimesdkvoice/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/cleanrooms/endpoints_test.go b/service/cleanrooms/endpoints_test.go index 6298ef3a85f..4e07def27d6 100644 --- a/service/cleanrooms/endpoints_test.go +++ b/service/cleanrooms/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cleanrooms/generated.json b/service/cleanrooms/generated.json index 0f561fa65ab..480f5a389f4 100644 --- a/service/cleanrooms/generated.json +++ b/service/cleanrooms/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/cleanrooms/go.mod b/service/cleanrooms/go.mod index 1bba7404f9a..966e57c6ba8 100644 --- a/service/cleanrooms/go.mod +++ b/service/cleanrooms/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cleanrooms/go.sum b/service/cleanrooms/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/cleanrooms/go.sum +++ b/service/cleanrooms/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/cleanroomsml/endpoints_test.go b/service/cleanroomsml/endpoints_test.go index 8bfb1fa923a..b02532faca3 100644 --- a/service/cleanroomsml/endpoints_test.go +++ b/service/cleanroomsml/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cleanroomsml/generated.json b/service/cleanroomsml/generated.json index aca5efbafbe..10d0a2e3293 100644 --- a/service/cleanroomsml/generated.json +++ b/service/cleanroomsml/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/cleanroomsml/go.mod b/service/cleanroomsml/go.mod index 1f003a43711..64f22dbe5d4 100644 --- a/service/cleanroomsml/go.mod +++ b/service/cleanroomsml/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cleanroomsml/go.sum b/service/cleanroomsml/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/cleanroomsml/go.sum +++ b/service/cleanroomsml/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/cloud9/endpoints_test.go b/service/cloud9/endpoints_test.go index 371e91730a7..d1fc1ee8940 100644 --- a/service/cloud9/endpoints_test.go +++ b/service/cloud9/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1310,14 +1246,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1369,14 +1303,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1428,14 +1360,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1487,14 +1417,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1527,14 +1455,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cloud9/generated.json b/service/cloud9/generated.json index 884a66b8a1d..cdb60a19232 100644 --- a/service/cloud9/generated.json +++ b/service/cloud9/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/cloud9/go.mod b/service/cloud9/go.mod index 73cba222dfc..4e2c6d70a99 100644 --- a/service/cloud9/go.mod +++ b/service/cloud9/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloud9/go.sum b/service/cloud9/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/cloud9/go.sum +++ b/service/cloud9/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/cloudcontrol/endpoints_test.go b/service/cloudcontrol/endpoints_test.go index f54514e0164..2b9d091e9e9 100644 --- a/service/cloudcontrol/endpoints_test.go +++ b/service/cloudcontrol/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1622,14 +1542,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1681,14 +1599,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1740,14 +1656,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1799,14 +1713,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cloudcontrol/generated.json b/service/cloudcontrol/generated.json index 76463c3ccdc..d6d0b1f1493 100644 --- a/service/cloudcontrol/generated.json +++ b/service/cloudcontrol/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/cloudcontrol/go.mod b/service/cloudcontrol/go.mod index 28c1b96786e..bc5a0f1e21e 100644 --- a/service/cloudcontrol/go.mod +++ b/service/cloudcontrol/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/cloudcontrol/go.sum b/service/cloudcontrol/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/cloudcontrol/go.sum +++ b/service/cloudcontrol/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/clouddirectory/endpoints_test.go b/service/clouddirectory/endpoints_test.go index 0fc6c818f9b..5272d5dd5a8 100644 --- a/service/clouddirectory/endpoints_test.go +++ b/service/clouddirectory/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -920,14 +876,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -979,14 +933,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1038,14 +990,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1097,14 +1047,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/clouddirectory/generated.json b/service/clouddirectory/generated.json index 4a6d8390bf6..08a13a28032 100644 --- a/service/clouddirectory/generated.json +++ b/service/clouddirectory/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/clouddirectory/go.mod b/service/clouddirectory/go.mod index d90abf38606..84f8ca97311 100644 --- a/service/clouddirectory/go.mod +++ b/service/clouddirectory/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/clouddirectory/go.sum b/service/clouddirectory/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/clouddirectory/go.sum +++ b/service/clouddirectory/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/cloudformation/endpoints_test.go b/service/cloudformation/endpoints_test.go index 74024e542bf..0b2143a17ca 100644 --- a/service/cloudformation/endpoints_test.go +++ b/service/cloudformation/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cloudformation/generated.json b/service/cloudformation/generated.json index 6c9a1965f84..c2920d31fb8 100644 --- a/service/cloudformation/generated.json +++ b/service/cloudformation/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/cloudformation/go.mod b/service/cloudformation/go.mod index e7d72b434bf..28736627c20 100644 --- a/service/cloudformation/go.mod +++ b/service/cloudformation/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/cloudformation/go.sum b/service/cloudformation/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/cloudformation/go.sum +++ b/service/cloudformation/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/cloudfront/endpoints_test.go b/service/cloudfront/endpoints_test.go index cf70f74a291..be081018e56 100644 --- a/service/cloudfront/endpoints_test.go +++ b/service/cloudfront/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -60,14 +60,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -115,14 +113,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -154,14 +150,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -209,14 +203,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -248,14 +240,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -303,14 +293,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -358,14 +346,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -397,14 +383,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -436,14 +420,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -475,14 +457,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +510,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -569,14 +547,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -608,14 +584,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -647,14 +621,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -686,14 +658,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -745,14 +715,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -804,14 +772,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -863,14 +829,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -922,14 +886,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -962,14 +924,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1001,14 +961,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cloudfront/generated.json b/service/cloudfront/generated.json index 41d6001aa98..bd06adb328e 100644 --- a/service/cloudfront/generated.json +++ b/service/cloudfront/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/cloudfront/go.mod b/service/cloudfront/go.mod index ea468804ad2..3730690c65f 100644 --- a/service/cloudfront/go.mod +++ b/service/cloudfront/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/cloudfront/go.sum b/service/cloudfront/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/cloudfront/go.sum +++ b/service/cloudfront/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/cloudfrontkeyvaluestore/endpoints_test.go b/service/cloudfrontkeyvaluestore/endpoints_test.go index 268976f3f11..ff536a1f44a 100644 --- a/service/cloudfrontkeyvaluestore/endpoints_test.go +++ b/service/cloudfrontkeyvaluestore/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -201,14 +201,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -255,14 +253,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -349,14 +345,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -403,14 +397,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cloudfrontkeyvaluestore/generated.json b/service/cloudfrontkeyvaluestore/generated.json index fc63daa8161..e30e5770542 100644 --- a/service/cloudfrontkeyvaluestore/generated.json +++ b/service/cloudfrontkeyvaluestore/generated.json @@ -4,8 +4,7 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/v4a": "v0.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/cloudfrontkeyvaluestore/go.mod b/service/cloudfrontkeyvaluestore/go.mod index 1343922b53c..6e139b27467 100644 --- a/service/cloudfrontkeyvaluestore/go.mod +++ b/service/cloudfrontkeyvaluestore/go.mod @@ -8,7 +8,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudfrontkeyvaluestore/go.sum b/service/cloudfrontkeyvaluestore/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/cloudfrontkeyvaluestore/go.sum +++ b/service/cloudfrontkeyvaluestore/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/cloudhsm/endpoints_test.go b/service/cloudhsm/endpoints_test.go index 4eba23fb4ed..e0d2c3d5b39 100644 --- a/service/cloudhsm/endpoints_test.go +++ b/service/cloudhsm/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -569,14 +543,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -628,14 +600,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -687,14 +657,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -746,14 +714,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cloudhsm/generated.json b/service/cloudhsm/generated.json index a25c8cda09e..d17c42ffcd8 100644 --- a/service/cloudhsm/generated.json +++ b/service/cloudhsm/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/cloudhsm/go.mod b/service/cloudhsm/go.mod index f6faef1fbc6..721cfb90702 100644 --- a/service/cloudhsm/go.mod +++ b/service/cloudhsm/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudhsm/go.sum b/service/cloudhsm/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/cloudhsm/go.sum +++ b/service/cloudhsm/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/cloudhsmv2/endpoints_test.go b/service/cloudhsmv2/endpoints_test.go index 32017744129..a496cd9b48a 100644 --- a/service/cloudhsmv2/endpoints_test.go +++ b/service/cloudhsmv2/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1349,14 +1283,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1408,14 +1340,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1467,14 +1397,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1526,14 +1454,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1605,14 +1529,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cloudhsmv2/generated.json b/service/cloudhsmv2/generated.json index 79b6c23f9a6..a4e09aefac9 100644 --- a/service/cloudhsmv2/generated.json +++ b/service/cloudhsmv2/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/cloudhsmv2/go.mod b/service/cloudhsmv2/go.mod index 1aabe59d882..1c1f5e79cda 100644 --- a/service/cloudhsmv2/go.mod +++ b/service/cloudhsmv2/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudhsmv2/go.sum b/service/cloudhsmv2/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/cloudhsmv2/go.sum +++ b/service/cloudhsmv2/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/cloudsearch/endpoints_test.go b/service/cloudsearch/endpoints_test.go index eb3368896a3..226efe96b97 100644 --- a/service/cloudsearch/endpoints_test.go +++ b/service/cloudsearch/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -881,14 +839,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -940,14 +896,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -999,14 +953,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1058,14 +1010,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1098,14 +1048,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cloudsearch/generated.json b/service/cloudsearch/generated.json index bda3dd9cc0a..aa71e26bf7f 100644 --- a/service/cloudsearch/generated.json +++ b/service/cloudsearch/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/cloudsearch/go.mod b/service/cloudsearch/go.mod index 119ec6d74e3..dca760cb0bf 100644 --- a/service/cloudsearch/go.mod +++ b/service/cloudsearch/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudsearch/go.sum b/service/cloudsearch/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/cloudsearch/go.sum +++ b/service/cloudsearch/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/cloudsearchdomain/endpoints_test.go b/service/cloudsearchdomain/endpoints_test.go index 4687d99990f..705febc824e 100644 --- a/service/cloudsearchdomain/endpoints_test.go +++ b/service/cloudsearchdomain/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cloudsearchdomain/generated.json b/service/cloudsearchdomain/generated.json index 37f8783edf0..951039e8722 100644 --- a/service/cloudsearchdomain/generated.json +++ b/service/cloudsearchdomain/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/cloudsearchdomain/go.mod b/service/cloudsearchdomain/go.mod index 311b6b80fdb..cdc32db3fc7 100644 --- a/service/cloudsearchdomain/go.mod +++ b/service/cloudsearchdomain/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudsearchdomain/go.sum b/service/cloudsearchdomain/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/cloudsearchdomain/go.sum +++ b/service/cloudsearchdomain/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/cloudtrail/endpoints_test.go b/service/cloudtrail/endpoints_test.go index c8a5f8462fb..166fc97bc25 100644 --- a/service/cloudtrail/endpoints_test.go +++ b/service/cloudtrail/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cloudtrail/generated.json b/service/cloudtrail/generated.json index 555a6e12e7a..7565d0069fa 100644 --- a/service/cloudtrail/generated.json +++ b/service/cloudtrail/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/cloudtrail/go.mod b/service/cloudtrail/go.mod index 25edf064891..f615400f190 100644 --- a/service/cloudtrail/go.mod +++ b/service/cloudtrail/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudtrail/go.sum b/service/cloudtrail/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/cloudtrail/go.sum +++ b/service/cloudtrail/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/cloudtraildata/endpoints_test.go b/service/cloudtraildata/endpoints_test.go index d5155a84f25..738a893007f 100644 --- a/service/cloudtraildata/endpoints_test.go +++ b/service/cloudtraildata/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cloudtraildata/generated.json b/service/cloudtraildata/generated.json index c2584ded2e0..4e97ab83df4 100644 --- a/service/cloudtraildata/generated.json +++ b/service/cloudtraildata/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/cloudtraildata/go.mod b/service/cloudtraildata/go.mod index f6d68891278..9ffe23d650b 100644 --- a/service/cloudtraildata/go.mod +++ b/service/cloudtraildata/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudtraildata/go.sum b/service/cloudtraildata/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/cloudtraildata/go.sum +++ b/service/cloudtraildata/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/cloudwatch/endpoints_test.go b/service/cloudwatch/endpoints_test.go index e53328252ee..3b75ef712f3 100644 --- a/service/cloudwatch/endpoints_test.go +++ b/service/cloudwatch/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cloudwatch/generated.json b/service/cloudwatch/generated.json index 45a39798bdb..4c3d7f8bc01 100644 --- a/service/cloudwatch/generated.json +++ b/service/cloudwatch/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/cloudwatch/go.mod b/service/cloudwatch/go.mod index b9e4b70dfc1..2b80736dd51 100644 --- a/service/cloudwatch/go.mod +++ b/service/cloudwatch/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/cloudwatch/go.sum b/service/cloudwatch/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/cloudwatch/go.sum +++ b/service/cloudwatch/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/cloudwatchevents/endpoints_test.go b/service/cloudwatchevents/endpoints_test.go index 222f610acfa..4cccf2b0ab6 100644 --- a/service/cloudwatchevents/endpoints_test.go +++ b/service/cloudwatchevents/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cloudwatchevents/generated.json b/service/cloudwatchevents/generated.json index 5e70170f8eb..0b38abaac88 100644 --- a/service/cloudwatchevents/generated.json +++ b/service/cloudwatchevents/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/cloudwatchevents/go.mod b/service/cloudwatchevents/go.mod index 1c222a2acd1..6b1c114bb65 100644 --- a/service/cloudwatchevents/go.mod +++ b/service/cloudwatchevents/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudwatchevents/go.sum b/service/cloudwatchevents/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/cloudwatchevents/go.sum +++ b/service/cloudwatchevents/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/cloudwatchlogs/endpoints_test.go b/service/cloudwatchlogs/endpoints_test.go index 02ff50d580c..1695861d8ac 100644 --- a/service/cloudwatchlogs/endpoints_test.go +++ b/service/cloudwatchlogs/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cloudwatchlogs/generated.json b/service/cloudwatchlogs/generated.json index a8614c9bd4a..7daaf61ebce 100644 --- a/service/cloudwatchlogs/generated.json +++ b/service/cloudwatchlogs/generated.json @@ -4,8 +4,7 @@ "github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/cloudwatchlogs/go.mod b/service/cloudwatchlogs/go.mod index 698971a3e38..49fcc9059c3 100644 --- a/service/cloudwatchlogs/go.mod +++ b/service/cloudwatchlogs/go.mod @@ -8,7 +8,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudwatchlogs/go.sum b/service/cloudwatchlogs/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/cloudwatchlogs/go.sum +++ b/service/cloudwatchlogs/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/codeartifact/endpoints_test.go b/service/codeartifact/endpoints_test.go index a7f61875cfd..be719d50b8b 100644 --- a/service/codeartifact/endpoints_test.go +++ b/service/codeartifact/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -998,14 +950,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1057,14 +1007,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1116,14 +1064,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1175,14 +1121,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1215,14 +1159,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1254,14 +1196,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/codeartifact/generated.json b/service/codeartifact/generated.json index 82e032934d7..51e85d51a65 100644 --- a/service/codeartifact/generated.json +++ b/service/codeartifact/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/codeartifact/go.mod b/service/codeartifact/go.mod index 2cfea481574..c277118531f 100644 --- a/service/codeartifact/go.mod +++ b/service/codeartifact/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codeartifact/go.sum b/service/codeartifact/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/codeartifact/go.sum +++ b/service/codeartifact/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/codebuild/endpoints_test.go b/service/codebuild/endpoints_test.go index 4991c46b2ef..1c7e756e56e 100644 --- a/service/codebuild/endpoints_test.go +++ b/service/codebuild/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1642,14 +1562,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1701,14 +1619,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1760,14 +1676,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/codebuild/generated.json b/service/codebuild/generated.json index ca943e6c367..69da1b168d2 100644 --- a/service/codebuild/generated.json +++ b/service/codebuild/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/codebuild/go.mod b/service/codebuild/go.mod index b9f3d64b406..934eb8e26e8 100644 --- a/service/codebuild/go.mod +++ b/service/codebuild/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codebuild/go.sum b/service/codebuild/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/codebuild/go.sum +++ b/service/codebuild/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/codecatalyst/endpoints_test.go b/service/codecatalyst/endpoints_test.go index 9247ed174c7..d8869e27dcf 100644 --- a/service/codecatalyst/endpoints_test.go +++ b/service/codecatalyst/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "testing" ) @@ -39,14 +39,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -74,14 +72,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -111,14 +107,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -148,14 +142,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -186,14 +178,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -223,14 +213,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -261,14 +249,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -298,14 +284,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -336,13 +320,11 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/codecatalyst/generated.json b/service/codecatalyst/generated.json index c89065210ff..8762cacd19b 100644 --- a/service/codecatalyst/generated.json +++ b/service/codecatalyst/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/codecatalyst/go.mod b/service/codecatalyst/go.mod index da5e220f6fa..b8260c5eefd 100644 --- a/service/codecatalyst/go.mod +++ b/service/codecatalyst/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codecatalyst/go.sum b/service/codecatalyst/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/codecatalyst/go.sum +++ b/service/codecatalyst/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/codecommit/endpoints_test.go b/service/codecommit/endpoints_test.go index 924a67e4d7b..efaec4ff3d2 100644 --- a/service/codecommit/endpoints_test.go +++ b/service/codecommit/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1642,14 +1562,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1701,14 +1619,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1760,14 +1676,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/codecommit/generated.json b/service/codecommit/generated.json index 3de082d2a76..801bbec897e 100644 --- a/service/codecommit/generated.json +++ b/service/codecommit/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/codecommit/go.mod b/service/codecommit/go.mod index 9be547a9772..2bed698f545 100644 --- a/service/codecommit/go.mod +++ b/service/codecommit/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codecommit/go.sum b/service/codecommit/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/codecommit/go.sum +++ b/service/codecommit/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/codedeploy/endpoints_test.go b/service/codedeploy/endpoints_test.go index a71b941c034..240338612af 100644 --- a/service/codedeploy/endpoints_test.go +++ b/service/codedeploy/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/codedeploy/generated.json b/service/codedeploy/generated.json index 5b730a51074..41daac14209 100644 --- a/service/codedeploy/generated.json +++ b/service/codedeploy/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/codedeploy/go.mod b/service/codedeploy/go.mod index f2513835272..eab4d56a93e 100644 --- a/service/codedeploy/go.mod +++ b/service/codedeploy/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/codedeploy/go.sum b/service/codedeploy/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/codedeploy/go.sum +++ b/service/codedeploy/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/codeguruprofiler/endpoints_test.go b/service/codeguruprofiler/endpoints_test.go index 46660582c12..7ca688c0eb6 100644 --- a/service/codeguruprofiler/endpoints_test.go +++ b/service/codeguruprofiler/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/codeguruprofiler/generated.json b/service/codeguruprofiler/generated.json index 27722e0142f..9ad783c3dd5 100644 --- a/service/codeguruprofiler/generated.json +++ b/service/codeguruprofiler/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/codeguruprofiler/go.mod b/service/codeguruprofiler/go.mod index 0d761f4df37..28426765e70 100644 --- a/service/codeguruprofiler/go.mod +++ b/service/codeguruprofiler/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codeguruprofiler/go.sum b/service/codeguruprofiler/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/codeguruprofiler/go.sum +++ b/service/codeguruprofiler/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/codegurureviewer/endpoints_test.go b/service/codegurureviewer/endpoints_test.go index 3f6cfa9012f..21ddf999435 100644 --- a/service/codegurureviewer/endpoints_test.go +++ b/service/codegurureviewer/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -881,14 +839,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -940,14 +896,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -999,14 +953,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1058,14 +1010,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1098,14 +1048,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/codegurureviewer/generated.json b/service/codegurureviewer/generated.json index 3d661d77538..192cedd1ed5 100644 --- a/service/codegurureviewer/generated.json +++ b/service/codegurureviewer/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/codegurureviewer/go.mod b/service/codegurureviewer/go.mod index d663fff4a99..7a1b9de88a8 100644 --- a/service/codegurureviewer/go.mod +++ b/service/codegurureviewer/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/codegurureviewer/go.sum b/service/codegurureviewer/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/codegurureviewer/go.sum +++ b/service/codegurureviewer/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/codegurusecurity/endpoints_test.go b/service/codegurusecurity/endpoints_test.go index 426b010637d..50a95936ebe 100644 --- a/service/codegurusecurity/endpoints_test.go +++ b/service/codegurusecurity/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/codegurusecurity/generated.json b/service/codegurusecurity/generated.json index 5614320fc42..d96b24d9b16 100644 --- a/service/codegurusecurity/generated.json +++ b/service/codegurusecurity/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/codegurusecurity/go.mod b/service/codegurusecurity/go.mod index ea53200be84..9dcb784e0f4 100644 --- a/service/codegurusecurity/go.mod +++ b/service/codegurusecurity/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codegurusecurity/go.sum b/service/codegurusecurity/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/codegurusecurity/go.sum +++ b/service/codegurusecurity/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/codepipeline/endpoints_test.go b/service/codepipeline/endpoints_test.go index 16cc760b90b..daacca65b07 100644 --- a/service/codepipeline/endpoints_test.go +++ b/service/codepipeline/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1466,14 +1394,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1525,14 +1451,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1584,14 +1508,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1643,14 +1565,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1722,14 +1640,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/codepipeline/generated.json b/service/codepipeline/generated.json index 0f0c156bcdd..cea8b619bb1 100644 --- a/service/codepipeline/generated.json +++ b/service/codepipeline/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/codepipeline/go.mod b/service/codepipeline/go.mod index 905556cab3d..23f3c097cc5 100644 --- a/service/codepipeline/go.mod +++ b/service/codepipeline/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codepipeline/go.sum b/service/codepipeline/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/codepipeline/go.sum +++ b/service/codepipeline/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/codestar/endpoints_test.go b/service/codestar/endpoints_test.go index 34910bb7bed..299226f2807 100644 --- a/service/codestar/endpoints_test.go +++ b/service/codestar/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -998,14 +950,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1057,14 +1007,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1116,14 +1064,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1175,14 +1121,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1215,14 +1159,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1254,14 +1196,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/codestar/generated.json b/service/codestar/generated.json index 3f830908650..e6abab0fcd5 100644 --- a/service/codestar/generated.json +++ b/service/codestar/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/codestar/go.mod b/service/codestar/go.mod index 74b3aa32fc8..15fef7ebef3 100644 --- a/service/codestar/go.mod +++ b/service/codestar/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codestar/go.sum b/service/codestar/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/codestar/go.sum +++ b/service/codestar/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/codestarconnections/endpoints_test.go b/service/codestarconnections/endpoints_test.go index 5adcf3a3ebc..2cba7502523 100644 --- a/service/codestarconnections/endpoints_test.go +++ b/service/codestarconnections/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1115,14 +1061,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1174,14 +1118,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1233,14 +1175,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1292,14 +1232,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/codestarconnections/generated.json b/service/codestarconnections/generated.json index 14a1bdbc5bb..03c80cdfb4f 100644 --- a/service/codestarconnections/generated.json +++ b/service/codestarconnections/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/codestarconnections/go.mod b/service/codestarconnections/go.mod index 9bcf39c9e75..ec8ee156f2f 100644 --- a/service/codestarconnections/go.mod +++ b/service/codestarconnections/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codestarconnections/go.sum b/service/codestarconnections/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/codestarconnections/go.sum +++ b/service/codestarconnections/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/codestarnotifications/endpoints_test.go b/service/codestarnotifications/endpoints_test.go index bb2f9d5f361..45630f1e3dd 100644 --- a/service/codestarnotifications/endpoints_test.go +++ b/service/codestarnotifications/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/codestarnotifications/generated.json b/service/codestarnotifications/generated.json index 70fd9ebf48a..589226b7e13 100644 --- a/service/codestarnotifications/generated.json +++ b/service/codestarnotifications/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/codestarnotifications/go.mod b/service/codestarnotifications/go.mod index fe89f5e6ecc..4bbb8789698 100644 --- a/service/codestarnotifications/go.mod +++ b/service/codestarnotifications/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codestarnotifications/go.sum b/service/codestarnotifications/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/codestarnotifications/go.sum +++ b/service/codestarnotifications/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/cognitoidentity/endpoints_test.go b/service/cognitoidentity/endpoints_test.go index abeee6b5aac..22ecacb0e81 100644 --- a/service/cognitoidentity/endpoints_test.go +++ b/service/cognitoidentity/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1310,14 +1246,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1369,14 +1303,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1428,14 +1360,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1487,14 +1417,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1527,14 +1455,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cognitoidentity/generated.json b/service/cognitoidentity/generated.json index f2294e1a435..b3fdfafd634 100644 --- a/service/cognitoidentity/generated.json +++ b/service/cognitoidentity/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/cognitoidentity/go.mod b/service/cognitoidentity/go.mod index 67e3937f743..f411ac326fc 100644 --- a/service/cognitoidentity/go.mod +++ b/service/cognitoidentity/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cognitoidentity/go.sum b/service/cognitoidentity/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/cognitoidentity/go.sum +++ b/service/cognitoidentity/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/cognitoidentityprovider/endpoints_test.go b/service/cognitoidentityprovider/endpoints_test.go index 4da9a4713a3..c27a638a295 100644 --- a/service/cognitoidentityprovider/endpoints_test.go +++ b/service/cognitoidentityprovider/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1349,14 +1283,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1408,14 +1340,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1467,14 +1397,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1526,14 +1454,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1605,14 +1529,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cognitoidentityprovider/generated.json b/service/cognitoidentityprovider/generated.json index f47ef411d4d..a2ff21c7d83 100644 --- a/service/cognitoidentityprovider/generated.json +++ b/service/cognitoidentityprovider/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/cognitoidentityprovider/go.mod b/service/cognitoidentityprovider/go.mod index 346737cd18b..387a4951910 100644 --- a/service/cognitoidentityprovider/go.mod +++ b/service/cognitoidentityprovider/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cognitoidentityprovider/go.sum b/service/cognitoidentityprovider/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/cognitoidentityprovider/go.sum +++ b/service/cognitoidentityprovider/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/cognitosync/endpoints_test.go b/service/cognitosync/endpoints_test.go index b5ff231c78f..63c20eed3a0 100644 --- a/service/cognitosync/endpoints_test.go +++ b/service/cognitosync/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -920,14 +876,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -979,14 +933,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1038,14 +990,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1097,14 +1047,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/cognitosync/generated.json b/service/cognitosync/generated.json index 92ccc95ba7b..fd3056a6444 100644 --- a/service/cognitosync/generated.json +++ b/service/cognitosync/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/cognitosync/go.mod b/service/cognitosync/go.mod index 4b794694727..ec5921935e3 100644 --- a/service/cognitosync/go.mod +++ b/service/cognitosync/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cognitosync/go.sum b/service/cognitosync/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/cognitosync/go.sum +++ b/service/cognitosync/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/comprehend/endpoints_test.go b/service/comprehend/endpoints_test.go index 8d51f6a2b79..c896776dc87 100644 --- a/service/comprehend/endpoints_test.go +++ b/service/comprehend/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1154,14 +1098,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1233,14 +1175,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1292,14 +1232,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/comprehend/generated.json b/service/comprehend/generated.json index 21aa7277ae8..c9cc1babd5f 100644 --- a/service/comprehend/generated.json +++ b/service/comprehend/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/comprehend/go.mod b/service/comprehend/go.mod index d5d5cd98e6c..4135fc29d44 100644 --- a/service/comprehend/go.mod +++ b/service/comprehend/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/comprehend/go.sum b/service/comprehend/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/comprehend/go.sum +++ b/service/comprehend/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/comprehendmedical/endpoints_test.go b/service/comprehendmedical/endpoints_test.go index 4938846401d..022853663fc 100644 --- a/service/comprehendmedical/endpoints_test.go +++ b/service/comprehendmedical/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -920,14 +876,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -979,14 +933,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1038,14 +990,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1097,14 +1047,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/comprehendmedical/generated.json b/service/comprehendmedical/generated.json index f7abf507315..e61e923c7c2 100644 --- a/service/comprehendmedical/generated.json +++ b/service/comprehendmedical/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/comprehendmedical/go.mod b/service/comprehendmedical/go.mod index 7aa75c23b88..7ad58029a65 100644 --- a/service/comprehendmedical/go.mod +++ b/service/comprehendmedical/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/comprehendmedical/go.sum b/service/comprehendmedical/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/comprehendmedical/go.sum +++ b/service/comprehendmedical/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/computeoptimizer/endpoints_test.go b/service/computeoptimizer/endpoints_test.go index 7e3076b87d1..9fe09ce3857 100644 --- a/service/computeoptimizer/endpoints_test.go +++ b/service/computeoptimizer/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1154,14 +1098,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1213,14 +1155,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1272,14 +1212,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1331,14 +1269,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1410,14 +1344,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/computeoptimizer/generated.json b/service/computeoptimizer/generated.json index 93b4844bfdc..a1ea72eb23f 100644 --- a/service/computeoptimizer/generated.json +++ b/service/computeoptimizer/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/computeoptimizer/go.mod b/service/computeoptimizer/go.mod index 003b81b44ac..14513648ff9 100644 --- a/service/computeoptimizer/go.mod +++ b/service/computeoptimizer/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/computeoptimizer/go.sum b/service/computeoptimizer/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/computeoptimizer/go.sum +++ b/service/computeoptimizer/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/configservice/endpoints_test.go b/service/configservice/endpoints_test.go index b2ff3607124..93dcaefabb8 100644 --- a/service/configservice/endpoints_test.go +++ b/service/configservice/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/configservice/generated.json b/service/configservice/generated.json index 6fb2b477fce..94179f4ee91 100644 --- a/service/configservice/generated.json +++ b/service/configservice/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/configservice/go.mod b/service/configservice/go.mod index bfc5c81728f..756fed7d13e 100644 --- a/service/configservice/go.mod +++ b/service/configservice/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/configservice/go.sum b/service/configservice/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/configservice/go.sum +++ b/service/configservice/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/connect/endpoints_test.go b/service/connect/endpoints_test.go index 8cce0dd03fd..1f880629c3e 100644 --- a/service/connect/endpoints_test.go +++ b/service/connect/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -959,14 +913,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1018,14 +970,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1077,14 +1027,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1136,14 +1084,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1215,14 +1159,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/connect/generated.json b/service/connect/generated.json index aa47424b32b..4f3cef2a33c 100644 --- a/service/connect/generated.json +++ b/service/connect/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/connect/go.mod b/service/connect/go.mod index 3a4f85cdfff..b155d82822e 100644 --- a/service/connect/go.mod +++ b/service/connect/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/connect/go.sum b/service/connect/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/connect/go.sum +++ b/service/connect/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/connectcampaigns/endpoints_test.go b/service/connectcampaigns/endpoints_test.go index 0e1830d36c8..89fe60297a0 100644 --- a/service/connectcampaigns/endpoints_test.go +++ b/service/connectcampaigns/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -647,14 +617,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -706,14 +674,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -765,14 +731,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -824,14 +788,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -864,14 +826,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -903,14 +863,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/connectcampaigns/generated.json b/service/connectcampaigns/generated.json index 3294c756a1c..d28ded0cf7e 100644 --- a/service/connectcampaigns/generated.json +++ b/service/connectcampaigns/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/connectcampaigns/go.mod b/service/connectcampaigns/go.mod index 8d123c18d0c..51195ff50e7 100644 --- a/service/connectcampaigns/go.mod +++ b/service/connectcampaigns/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/connectcampaigns/go.sum b/service/connectcampaigns/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/connectcampaigns/go.sum +++ b/service/connectcampaigns/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/connectcases/endpoints_test.go b/service/connectcases/endpoints_test.go index 9238c872008..045132f38e2 100644 --- a/service/connectcases/endpoints_test.go +++ b/service/connectcases/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/connectcases/generated.json b/service/connectcases/generated.json index ccc33e4e064..484c60c406b 100644 --- a/service/connectcases/generated.json +++ b/service/connectcases/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/connectcases/go.mod b/service/connectcases/go.mod index 9b38f9f6834..9f78a32337d 100644 --- a/service/connectcases/go.mod +++ b/service/connectcases/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/connectcases/go.sum b/service/connectcases/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/connectcases/go.sum +++ b/service/connectcases/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/connectcontactlens/endpoints_test.go b/service/connectcontactlens/endpoints_test.go index 36d8f6475d4..68d46df54f3 100644 --- a/service/connectcontactlens/endpoints_test.go +++ b/service/connectcontactlens/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -803,14 +765,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -862,14 +822,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -921,14 +879,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -980,14 +936,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1020,14 +974,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1059,14 +1011,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/connectcontactlens/generated.json b/service/connectcontactlens/generated.json index 1acff85962f..f86a756a5ab 100644 --- a/service/connectcontactlens/generated.json +++ b/service/connectcontactlens/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/connectcontactlens/go.mod b/service/connectcontactlens/go.mod index 8ba572f7333..fa7e0e999e4 100644 --- a/service/connectcontactlens/go.mod +++ b/service/connectcontactlens/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/connectcontactlens/go.sum b/service/connectcontactlens/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/connectcontactlens/go.sum +++ b/service/connectcontactlens/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/connectparticipant/endpoints_test.go b/service/connectparticipant/endpoints_test.go index 238aec009ad..341fbb36ad8 100644 --- a/service/connectparticipant/endpoints_test.go +++ b/service/connectparticipant/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -608,14 +580,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -667,14 +637,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -726,14 +694,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -785,14 +751,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -864,14 +826,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/connectparticipant/generated.json b/service/connectparticipant/generated.json index 0d027ff31f9..9fda50a46d0 100644 --- a/service/connectparticipant/generated.json +++ b/service/connectparticipant/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/connectparticipant/go.mod b/service/connectparticipant/go.mod index e89de816739..b88eda5b20a 100644 --- a/service/connectparticipant/go.mod +++ b/service/connectparticipant/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/connectparticipant/go.sum b/service/connectparticipant/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/connectparticipant/go.sum +++ b/service/connectparticipant/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/controltower/endpoints_test.go b/service/controltower/endpoints_test.go index 1703808decf..39657617eec 100644 --- a/service/controltower/endpoints_test.go +++ b/service/controltower/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1193,14 +1135,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1252,14 +1192,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1311,14 +1249,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1370,14 +1306,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1410,14 +1344,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1449,14 +1381,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/controltower/generated.json b/service/controltower/generated.json index 750c9843929..bf8fc41f9d2 100644 --- a/service/controltower/generated.json +++ b/service/controltower/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/controltower/go.mod b/service/controltower/go.mod index e1f28684e8e..35f69d3d011 100644 --- a/service/controltower/go.mod +++ b/service/controltower/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/controltower/go.sum b/service/controltower/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/controltower/go.sum +++ b/service/controltower/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/costandusagereportservice/endpoints_test.go b/service/costandusagereportservice/endpoints_test.go index 4f7b875d9ad..5be66e600bf 100644 --- a/service/costandusagereportservice/endpoints_test.go +++ b/service/costandusagereportservice/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -569,14 +543,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -628,14 +600,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -687,14 +657,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -746,14 +714,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/costandusagereportservice/generated.json b/service/costandusagereportservice/generated.json index 8e8d3cecefb..b46cc576868 100644 --- a/service/costandusagereportservice/generated.json +++ b/service/costandusagereportservice/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/costandusagereportservice/go.mod b/service/costandusagereportservice/go.mod index ff40d644adb..fe5f3ad1bee 100644 --- a/service/costandusagereportservice/go.mod +++ b/service/costandusagereportservice/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/costandusagereportservice/go.sum b/service/costandusagereportservice/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/costandusagereportservice/go.sum +++ b/service/costandusagereportservice/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/costexplorer/endpoints_test.go b/service/costexplorer/endpoints_test.go index 34c304c2992..33e30945e7d 100644 --- a/service/costexplorer/endpoints_test.go +++ b/service/costexplorer/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -60,14 +60,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -99,14 +97,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -138,14 +134,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -177,14 +171,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -232,14 +224,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -287,14 +277,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -326,14 +314,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -365,14 +351,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -404,14 +388,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -459,14 +441,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -498,14 +478,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -537,14 +515,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -576,14 +552,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -615,14 +589,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -674,14 +646,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -733,14 +703,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -792,14 +760,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -851,14 +817,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -891,14 +855,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -930,14 +892,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/costexplorer/generated.json b/service/costexplorer/generated.json index 7f354e10a06..3836d745f95 100644 --- a/service/costexplorer/generated.json +++ b/service/costexplorer/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/costexplorer/go.mod b/service/costexplorer/go.mod index b1a4d9b1b84..d386b27d7c9 100644 --- a/service/costexplorer/go.mod +++ b/service/costexplorer/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/costexplorer/go.sum b/service/costexplorer/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/costexplorer/go.sum +++ b/service/costexplorer/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/costoptimizationhub/endpoints_test.go b/service/costoptimizationhub/endpoints_test.go index 4cf7eedb8c5..8b521420add 100644 --- a/service/costoptimizationhub/endpoints_test.go +++ b/service/costoptimizationhub/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/costoptimizationhub/generated.json b/service/costoptimizationhub/generated.json index e0f4314d159..ce3c6a2533a 100644 --- a/service/costoptimizationhub/generated.json +++ b/service/costoptimizationhub/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/costoptimizationhub/go.mod b/service/costoptimizationhub/go.mod index e8f631d385a..770de2af155 100644 --- a/service/costoptimizationhub/go.mod +++ b/service/costoptimizationhub/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/costoptimizationhub/go.sum b/service/costoptimizationhub/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/costoptimizationhub/go.sum +++ b/service/costoptimizationhub/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/customerprofiles/endpoints_test.go b/service/customerprofiles/endpoints_test.go index 76b87cb8e93..dd71cda87d5 100644 --- a/service/customerprofiles/endpoints_test.go +++ b/service/customerprofiles/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -881,14 +839,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -940,14 +896,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -999,14 +953,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1058,14 +1010,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1098,14 +1048,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/customerprofiles/generated.json b/service/customerprofiles/generated.json index 3652d22c3ef..3fee19e4061 100644 --- a/service/customerprofiles/generated.json +++ b/service/customerprofiles/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/customerprofiles/go.mod b/service/customerprofiles/go.mod index 541058a2702..33a1a29799c 100644 --- a/service/customerprofiles/go.mod +++ b/service/customerprofiles/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/customerprofiles/go.sum b/service/customerprofiles/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/customerprofiles/go.sum +++ b/service/customerprofiles/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/databasemigrationservice/endpoints_test.go b/service/databasemigrationservice/endpoints_test.go index ea1b7db3f06..3b608b650c0 100644 --- a/service/databasemigrationservice/endpoints_test.go +++ b/service/databasemigrationservice/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1641,14 +1559,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1680,14 +1596,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1759,14 +1673,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1798,14 +1710,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1917,14 +1825,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/databasemigrationservice/generated.json b/service/databasemigrationservice/generated.json index 8ce6df2b12a..ff37f3b4de2 100644 --- a/service/databasemigrationservice/generated.json +++ b/service/databasemigrationservice/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/databasemigrationservice/go.mod b/service/databasemigrationservice/go.mod index 1f1635d1752..ab933d70a7b 100644 --- a/service/databasemigrationservice/go.mod +++ b/service/databasemigrationservice/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/databasemigrationservice/go.sum b/service/databasemigrationservice/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/databasemigrationservice/go.sum +++ b/service/databasemigrationservice/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/databrew/endpoints_test.go b/service/databrew/endpoints_test.go index 657680462ba..34cc1c42426 100644 --- a/service/databrew/endpoints_test.go +++ b/service/databrew/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1349,14 +1283,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1408,14 +1340,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1467,14 +1397,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1526,14 +1454,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1605,14 +1529,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/databrew/generated.json b/service/databrew/generated.json index 0edfd002504..d243232a1ea 100644 --- a/service/databrew/generated.json +++ b/service/databrew/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/databrew/go.mod b/service/databrew/go.mod index 0f82768c2a1..f4f0569a346 100644 --- a/service/databrew/go.mod +++ b/service/databrew/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/databrew/go.sum b/service/databrew/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/databrew/go.sum +++ b/service/databrew/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/dataexchange/endpoints_test.go b/service/dataexchange/endpoints_test.go index c31115568a7..7dd8a56c219 100644 --- a/service/dataexchange/endpoints_test.go +++ b/service/dataexchange/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -920,14 +876,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -979,14 +933,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1038,14 +990,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1097,14 +1047,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/dataexchange/generated.json b/service/dataexchange/generated.json index e6ff3b0f7a7..1b9fbe77528 100644 --- a/service/dataexchange/generated.json +++ b/service/dataexchange/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/dataexchange/go.mod b/service/dataexchange/go.mod index 77e33b8bad6..d7c010deae7 100644 --- a/service/dataexchange/go.mod +++ b/service/dataexchange/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/dataexchange/go.sum b/service/dataexchange/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/dataexchange/go.sum +++ b/service/dataexchange/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/datapipeline/endpoints_test.go b/service/datapipeline/endpoints_test.go index e82d6dcb88a..ce3bc8a6ff5 100644 --- a/service/datapipeline/endpoints_test.go +++ b/service/datapipeline/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -725,14 +691,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -804,14 +768,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -863,14 +825,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -903,14 +863,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +900,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/datapipeline/generated.json b/service/datapipeline/generated.json index 40f61efc05f..10c6fca4c35 100644 --- a/service/datapipeline/generated.json +++ b/service/datapipeline/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/datapipeline/go.mod b/service/datapipeline/go.mod index 46df4bb10c7..27e87513c4e 100644 --- a/service/datapipeline/go.mod +++ b/service/datapipeline/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/datapipeline/go.sum b/service/datapipeline/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/datapipeline/go.sum +++ b/service/datapipeline/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/datasync/endpoints_test.go b/service/datasync/endpoints_test.go index 25c51569e49..76e9f64536c 100644 --- a/service/datasync/endpoints_test.go +++ b/service/datasync/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1642,14 +1562,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1701,14 +1619,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1760,14 +1676,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/datasync/generated.json b/service/datasync/generated.json index 6438b442e9a..69e02523087 100644 --- a/service/datasync/generated.json +++ b/service/datasync/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/datasync/go.mod b/service/datasync/go.mod index c197144cdc6..08171db23cf 100644 --- a/service/datasync/go.mod +++ b/service/datasync/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/datasync/go.sum b/service/datasync/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/datasync/go.sum +++ b/service/datasync/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/datazone/endpoints_test.go b/service/datazone/endpoints_test.go index 7acc6f94b0f..0ce55f77e3d 100644 --- a/service/datazone/endpoints_test.go +++ b/service/datazone/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -41,14 +41,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -79,14 +77,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -117,14 +113,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -155,14 +149,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -193,14 +185,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -231,14 +221,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -270,14 +258,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -308,14 +294,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/datazone/generated.json b/service/datazone/generated.json index 2a2b1a89257..8f3cb7a9dac 100644 --- a/service/datazone/generated.json +++ b/service/datazone/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/datazone/go.mod b/service/datazone/go.mod index 1aeb6b98f86..a96b5813d70 100644 --- a/service/datazone/go.mod +++ b/service/datazone/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/datazone/go.sum b/service/datazone/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/datazone/go.sum +++ b/service/datazone/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/dax/endpoints_test.go b/service/dax/endpoints_test.go index a37f1429b43..66badda0bfd 100644 --- a/service/dax/endpoints_test.go +++ b/service/dax/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1037,14 +987,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1096,14 +1044,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1155,14 +1101,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1214,14 +1158,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1254,14 +1196,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1293,14 +1233,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/dax/generated.json b/service/dax/generated.json index ab8c3ed86c2..7b8a9a99c80 100644 --- a/service/dax/generated.json +++ b/service/dax/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/dax/go.mod b/service/dax/go.mod index f34d2b61e58..253280a3b92 100644 --- a/service/dax/go.mod +++ b/service/dax/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/dax/go.sum b/service/dax/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/dax/go.sum +++ b/service/dax/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/detective/endpoints_test.go b/service/detective/endpoints_test.go index 5cefa5f793e..208bc0fc708 100644 --- a/service/detective/endpoints_test.go +++ b/service/detective/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1466,14 +1394,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1525,14 +1451,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1584,14 +1508,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1643,14 +1565,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1722,14 +1640,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/detective/generated.json b/service/detective/generated.json index 9b170f0f1f2..1a1eba57d7d 100644 --- a/service/detective/generated.json +++ b/service/detective/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/detective/go.mod b/service/detective/go.mod index 1b94e3fa0ec..3fbf21ea70c 100644 --- a/service/detective/go.mod +++ b/service/detective/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/detective/go.sum b/service/detective/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/detective/go.sum +++ b/service/detective/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/devicefarm/endpoints_test.go b/service/devicefarm/endpoints_test.go index 1a2c2d1d9a8..8da73a5ede7 100644 --- a/service/devicefarm/endpoints_test.go +++ b/service/devicefarm/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -569,14 +543,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -628,14 +600,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -687,14 +657,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -746,14 +714,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/devicefarm/generated.json b/service/devicefarm/generated.json index 6f65f7d8734..f2949905490 100644 --- a/service/devicefarm/generated.json +++ b/service/devicefarm/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/devicefarm/go.mod b/service/devicefarm/go.mod index b2f6b8e3ed1..943053e4b77 100644 --- a/service/devicefarm/go.mod +++ b/service/devicefarm/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/devicefarm/go.sum b/service/devicefarm/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/devicefarm/go.sum +++ b/service/devicefarm/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/devopsguru/endpoints_test.go b/service/devopsguru/endpoints_test.go index afd6ba7ca8b..528ebef07b5 100644 --- a/service/devopsguru/endpoints_test.go +++ b/service/devopsguru/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -920,14 +876,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -979,14 +933,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1038,14 +990,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1097,14 +1047,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/devopsguru/generated.json b/service/devopsguru/generated.json index 27962c5a92f..376733c796f 100644 --- a/service/devopsguru/generated.json +++ b/service/devopsguru/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/devopsguru/go.mod b/service/devopsguru/go.mod index f4f036796e9..eef600868cc 100644 --- a/service/devopsguru/go.mod +++ b/service/devopsguru/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/devopsguru/go.sum b/service/devopsguru/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/devopsguru/go.sum +++ b/service/devopsguru/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/directconnect/endpoints_test.go b/service/directconnect/endpoints_test.go index 5d1cbcf75b6..234e9b5e71c 100644 --- a/service/directconnect/endpoints_test.go +++ b/service/directconnect/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1622,14 +1542,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1681,14 +1599,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1740,14 +1656,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/directconnect/generated.json b/service/directconnect/generated.json index 58b0e92e8e6..0e75d52ea9f 100644 --- a/service/directconnect/generated.json +++ b/service/directconnect/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/directconnect/go.mod b/service/directconnect/go.mod index 7390bb29bfb..ff54d2aba83 100644 --- a/service/directconnect/go.mod +++ b/service/directconnect/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/directconnect/go.sum b/service/directconnect/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/directconnect/go.sum +++ b/service/directconnect/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/directoryservice/endpoints_test.go b/service/directoryservice/endpoints_test.go index de71c9f7e22..e57fbf7526f 100644 --- a/service/directoryservice/endpoints_test.go +++ b/service/directoryservice/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1622,14 +1542,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1681,14 +1599,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1740,14 +1656,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/directoryservice/generated.json b/service/directoryservice/generated.json index cb0afadbb22..343e2ff6d87 100644 --- a/service/directoryservice/generated.json +++ b/service/directoryservice/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/directoryservice/go.mod b/service/directoryservice/go.mod index 2e662fe7986..2955610656b 100644 --- a/service/directoryservice/go.mod +++ b/service/directoryservice/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/directoryservice/go.sum b/service/directoryservice/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/directoryservice/go.sum +++ b/service/directoryservice/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/dlm/endpoints_test.go b/service/dlm/endpoints_test.go index af05ccb8342..3f9a93d6043 100644 --- a/service/dlm/endpoints_test.go +++ b/service/dlm/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1466,14 +1394,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1525,14 +1451,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1584,14 +1508,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1643,14 +1565,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1722,14 +1640,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/dlm/generated.json b/service/dlm/generated.json index 1741c3cbaaa..6a9ff2726bf 100644 --- a/service/dlm/generated.json +++ b/service/dlm/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/dlm/go.mod b/service/dlm/go.mod index dd8450e0a26..706d6592ad1 100644 --- a/service/dlm/go.mod +++ b/service/dlm/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/dlm/go.sum b/service/dlm/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/dlm/go.sum +++ b/service/dlm/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/docdb/endpoints_test.go b/service/docdb/endpoints_test.go index fda63aa3413..cfc2833dad2 100644 --- a/service/docdb/endpoints_test.go +++ b/service/docdb/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1641,14 +1559,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1700,14 +1616,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1759,14 +1673,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1818,14 +1730,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1917,14 +1825,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/docdb/generated.json b/service/docdb/generated.json index 3ee1a8b5ca6..5f97e2c4ad3 100644 --- a/service/docdb/generated.json +++ b/service/docdb/generated.json @@ -6,7 +6,6 @@ "github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding": "v1.0.5", "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url": "v1.0.7", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/docdb/go.mod b/service/docdb/go.mod index 8b3a1a1ed47..2a75b5537f7 100644 --- a/service/docdb/go.mod +++ b/service/docdb/go.mod @@ -9,7 +9,6 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.4 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/docdb/go.sum b/service/docdb/go.sum index 373314e89bc..2230ad62888 100644 --- a/service/docdb/go.sum +++ b/service/docdb/go.sum @@ -3,7 +3,6 @@ github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/docdbelastic/endpoints_test.go b/service/docdbelastic/endpoints_test.go index 7fd60e292a4..b30a3f63804 100644 --- a/service/docdbelastic/endpoints_test.go +++ b/service/docdbelastic/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/docdbelastic/generated.json b/service/docdbelastic/generated.json index 5b4e4d8f58a..8dc24063c14 100644 --- a/service/docdbelastic/generated.json +++ b/service/docdbelastic/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/docdbelastic/go.mod b/service/docdbelastic/go.mod index ef7a98f9bbc..54b18200e68 100644 --- a/service/docdbelastic/go.mod +++ b/service/docdbelastic/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/docdbelastic/go.sum b/service/docdbelastic/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/docdbelastic/go.sum +++ b/service/docdbelastic/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/drs/endpoints_test.go b/service/drs/endpoints_test.go index 3f314735602..7e332aab10f 100644 --- a/service/drs/endpoints_test.go +++ b/service/drs/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1310,14 +1246,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1369,14 +1303,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1428,14 +1360,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1487,14 +1417,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1527,14 +1455,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/drs/generated.json b/service/drs/generated.json index 96628a78207..8fe63f23ca6 100644 --- a/service/drs/generated.json +++ b/service/drs/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/drs/go.mod b/service/drs/go.mod index c0539c47009..4b3666fee01 100644 --- a/service/drs/go.mod +++ b/service/drs/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/drs/go.sum b/service/drs/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/drs/go.sum +++ b/service/drs/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/dynamodb/endpoints_test.go b/service/dynamodb/endpoints_test.go index 529dae560d0..0a8906763d1 100644 --- a/service/dynamodb/endpoints_test.go +++ b/service/dynamodb/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -44,14 +44,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -83,14 +81,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -122,14 +118,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -161,14 +155,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -200,14 +192,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -239,14 +229,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -278,14 +266,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -317,14 +303,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -356,14 +340,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -395,14 +377,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -434,14 +414,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -473,14 +451,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -512,14 +488,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -551,14 +525,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -590,14 +562,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -629,14 +599,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -668,14 +636,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -723,14 +689,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -762,14 +726,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -801,14 +763,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -840,14 +800,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -879,14 +837,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -918,14 +874,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -957,14 +911,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -996,14 +948,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1035,14 +985,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1074,14 +1022,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1113,14 +1059,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1152,14 +1096,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1191,14 +1133,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1230,14 +1170,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1269,14 +1207,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1308,14 +1244,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1347,14 +1281,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1386,14 +1318,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1425,14 +1355,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1464,14 +1392,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1503,14 +1429,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1542,14 +1466,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1581,14 +1503,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1620,14 +1540,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1659,14 +1577,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1698,14 +1614,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1757,14 +1671,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1816,14 +1728,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1875,14 +1785,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1935,14 +1843,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1974,14 +1880,12 @@ func TestEndpointCase51(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/dynamodb/generated.json b/service/dynamodb/generated.json index 0c57399cff3..bed9c33b80e 100644 --- a/service/dynamodb/generated.json +++ b/service/dynamodb/generated.json @@ -6,7 +6,6 @@ "github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding": "v1.0.5", "github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery": "v0.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/dynamodb/go.mod b/service/dynamodb/go.mod index 77f16c6f631..d1bbcabd65b 100644 --- a/service/dynamodb/go.mod +++ b/service/dynamodb/go.mod @@ -9,7 +9,6 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.3 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/dynamodb/go.sum b/service/dynamodb/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/dynamodb/go.sum +++ b/service/dynamodb/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/dynamodbstreams/endpoints_test.go b/service/dynamodbstreams/endpoints_test.go index 64d583f9f2e..c3c3c85d915 100644 --- a/service/dynamodbstreams/endpoints_test.go +++ b/service/dynamodbstreams/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -44,14 +44,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -83,14 +81,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -122,14 +118,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -161,14 +155,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -200,14 +192,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -239,14 +229,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -278,14 +266,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -317,14 +303,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -356,14 +340,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -395,14 +377,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -434,14 +414,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -473,14 +451,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -512,14 +488,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -551,14 +525,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -590,14 +562,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -629,14 +599,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -684,14 +652,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -723,14 +689,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -762,14 +726,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -801,14 +763,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -840,14 +800,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -879,14 +837,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -918,14 +874,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -957,14 +911,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -996,14 +948,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1035,14 +985,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1074,14 +1022,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1113,14 +1059,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1152,14 +1096,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1191,14 +1133,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1230,14 +1170,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1269,14 +1207,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1308,14 +1244,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1347,14 +1281,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1386,14 +1318,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1425,14 +1355,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1464,14 +1392,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1503,14 +1429,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1562,14 +1486,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1621,14 +1543,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1680,14 +1600,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1740,14 +1658,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1695,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/dynamodbstreams/generated.json b/service/dynamodbstreams/generated.json index be5714f2a13..0de7f9a4278 100644 --- a/service/dynamodbstreams/generated.json +++ b/service/dynamodbstreams/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/dynamodbstreams/go.mod b/service/dynamodbstreams/go.mod index b6f985b3a28..214571c966d 100644 --- a/service/dynamodbstreams/go.mod +++ b/service/dynamodbstreams/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/dynamodbstreams/go.sum b/service/dynamodbstreams/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/dynamodbstreams/go.sum +++ b/service/dynamodbstreams/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/ebs/endpoints_test.go b/service/ebs/endpoints_test.go index bc04fe45cd5..11632d62292 100644 --- a/service/ebs/endpoints_test.go +++ b/service/ebs/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1622,14 +1542,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1681,14 +1599,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1740,14 +1656,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ebs/generated.json b/service/ebs/generated.json index b547d2e792c..fecad6a0f6a 100644 --- a/service/ebs/generated.json +++ b/service/ebs/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/ebs/go.mod b/service/ebs/go.mod index 4d2e33af26a..c9e0729f15d 100644 --- a/service/ebs/go.mod +++ b/service/ebs/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ebs/go.sum b/service/ebs/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/ebs/go.sum +++ b/service/ebs/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/ec2/endpoints_test.go b/service/ec2/endpoints_test.go index d568f4af8e2..5e15edccef1 100644 --- a/service/ec2/endpoints_test.go +++ b/service/ec2/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1641,14 +1559,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1680,14 +1596,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1719,14 +1633,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1758,14 +1670,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1797,14 +1707,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1856,14 +1764,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1915,14 +1821,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1974,14 +1878,12 @@ func TestEndpointCase51(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2034,14 +1936,12 @@ func TestEndpointCase53(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2073,14 +1973,12 @@ func TestEndpointCase54(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ec2/generated.json b/service/ec2/generated.json index b64baa9141e..b7049e9b1f8 100644 --- a/service/ec2/generated.json +++ b/service/ec2/generated.json @@ -6,7 +6,6 @@ "github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding": "v1.0.5", "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url": "v1.0.7", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/ec2/go.mod b/service/ec2/go.mod index 2f124b31f92..3e5247db4a0 100644 --- a/service/ec2/go.mod +++ b/service/ec2/go.mod @@ -9,7 +9,6 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.4 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/ec2/go.sum b/service/ec2/go.sum index 373314e89bc..2230ad62888 100644 --- a/service/ec2/go.sum +++ b/service/ec2/go.sum @@ -3,7 +3,6 @@ github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/ec2instanceconnect/endpoints_test.go b/service/ec2instanceconnect/endpoints_test.go index 8b829501bde..74c188b83a7 100644 --- a/service/ec2instanceconnect/endpoints_test.go +++ b/service/ec2instanceconnect/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ec2instanceconnect/generated.json b/service/ec2instanceconnect/generated.json index 3b335439bc1..5c8b99062f2 100644 --- a/service/ec2instanceconnect/generated.json +++ b/service/ec2instanceconnect/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/ec2instanceconnect/go.mod b/service/ec2instanceconnect/go.mod index 95eda458052..7a5a31797a0 100644 --- a/service/ec2instanceconnect/go.mod +++ b/service/ec2instanceconnect/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ec2instanceconnect/go.sum b/service/ec2instanceconnect/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/ec2instanceconnect/go.sum +++ b/service/ec2instanceconnect/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/ecr/endpoints_test.go b/service/ecr/endpoints_test.go index 4cebe340896..febabd8fcf4 100644 --- a/service/ecr/endpoints_test.go +++ b/service/ecr/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ecr/generated.json b/service/ecr/generated.json index 3c724c361b9..2e7e94262bf 100644 --- a/service/ecr/generated.json +++ b/service/ecr/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/ecr/go.mod b/service/ecr/go.mod index 6fbb7dd73d3..cfcf13f53d3 100644 --- a/service/ecr/go.mod +++ b/service/ecr/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/ecr/go.sum b/service/ecr/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/ecr/go.sum +++ b/service/ecr/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/ecrpublic/endpoints_test.go b/service/ecrpublic/endpoints_test.go index 5ee67c40adc..2dcaefb30df 100644 --- a/service/ecrpublic/endpoints_test.go +++ b/service/ecrpublic/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ecrpublic/generated.json b/service/ecrpublic/generated.json index e025d1b794d..f11524a5feb 100644 --- a/service/ecrpublic/generated.json +++ b/service/ecrpublic/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/ecrpublic/go.mod b/service/ecrpublic/go.mod index 0add827a91f..8932a8a0384 100644 --- a/service/ecrpublic/go.mod +++ b/service/ecrpublic/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ecrpublic/go.sum b/service/ecrpublic/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/ecrpublic/go.sum +++ b/service/ecrpublic/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/ecs/endpoints_test.go b/service/ecs/endpoints_test.go index 593368e5887..ad6293bf099 100644 --- a/service/ecs/endpoints_test.go +++ b/service/ecs/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ecs/generated.json b/service/ecs/generated.json index f9f844f4f33..bb4c88a1b84 100644 --- a/service/ecs/generated.json +++ b/service/ecs/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/ecs/go.mod b/service/ecs/go.mod index f78d8864ead..41a945ffa79 100644 --- a/service/ecs/go.mod +++ b/service/ecs/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/ecs/go.sum b/service/ecs/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/ecs/go.sum +++ b/service/ecs/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/efs/endpoints_test.go b/service/efs/endpoints_test.go index 733a7fad7f2..580e621f7d6 100644 --- a/service/efs/endpoints_test.go +++ b/service/efs/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1641,14 +1559,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1680,14 +1596,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1719,14 +1633,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1758,14 +1670,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1797,14 +1707,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1836,14 +1744,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1875,14 +1781,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1914,14 +1818,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1953,14 +1855,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1992,14 +1892,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2031,14 +1929,12 @@ func TestEndpointCase51(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2070,14 +1966,12 @@ func TestEndpointCase52(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2109,14 +2003,12 @@ func TestEndpointCase53(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2148,14 +2040,12 @@ func TestEndpointCase54(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2187,14 +2077,12 @@ func TestEndpointCase55(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2226,14 +2114,12 @@ func TestEndpointCase56(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2265,14 +2151,12 @@ func TestEndpointCase57(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2304,14 +2188,12 @@ func TestEndpointCase58(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2343,14 +2225,12 @@ func TestEndpointCase59(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2422,14 +2302,12 @@ func TestEndpointCase62(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2461,14 +2339,12 @@ func TestEndpointCase63(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2541,14 +2417,12 @@ func TestEndpointCase66(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2580,14 +2454,12 @@ func TestEndpointCase67(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/efs/generated.json b/service/efs/generated.json index b1bb6cffc20..8ebd791ca72 100644 --- a/service/efs/generated.json +++ b/service/efs/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/efs/go.mod b/service/efs/go.mod index 9b25ac62908..8db687ce5e6 100644 --- a/service/efs/go.mod +++ b/service/efs/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/efs/go.sum b/service/efs/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/efs/go.sum +++ b/service/efs/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/eks/endpoints_test.go b/service/eks/endpoints_test.go index 59dd13d29c8..3d83977f6b9 100644 --- a/service/eks/endpoints_test.go +++ b/service/eks/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1622,14 +1542,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1681,14 +1599,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1740,14 +1656,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/eks/generated.json b/service/eks/generated.json index d495f8b0f26..5dc0c284508 100644 --- a/service/eks/generated.json +++ b/service/eks/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/eks/go.mod b/service/eks/go.mod index bef725082ce..54949abf665 100644 --- a/service/eks/go.mod +++ b/service/eks/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/eks/go.sum b/service/eks/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/eks/go.sum +++ b/service/eks/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/eksauth/endpoints_test.go b/service/eksauth/endpoints_test.go index 99ad9ecfd2f..0fcf985370f 100644 --- a/service/eksauth/endpoints_test.go +++ b/service/eksauth/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -41,14 +41,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -79,14 +77,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -117,14 +113,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -155,14 +149,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -193,14 +185,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -231,14 +221,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -270,14 +258,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -308,14 +294,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/eksauth/generated.json b/service/eksauth/generated.json index dc8852f1034..255c9d0afdd 100644 --- a/service/eksauth/generated.json +++ b/service/eksauth/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/eksauth/go.mod b/service/eksauth/go.mod index cc802991516..5b6503c4ff7 100644 --- a/service/eksauth/go.mod +++ b/service/eksauth/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/eksauth/go.sum b/service/eksauth/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/eksauth/go.sum +++ b/service/eksauth/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/elasticache/endpoints_test.go b/service/elasticache/endpoints_test.go index d9d2c4de859..392637e25a2 100644 --- a/service/elasticache/endpoints_test.go +++ b/service/elasticache/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/elasticache/generated.json b/service/elasticache/generated.json index 94df1cb97dd..3913acb86d4 100644 --- a/service/elasticache/generated.json +++ b/service/elasticache/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/elasticache/go.mod b/service/elasticache/go.mod index a117d77d4aa..5fb828435aa 100644 --- a/service/elasticache/go.mod +++ b/service/elasticache/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/elasticache/go.sum b/service/elasticache/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/elasticache/go.sum +++ b/service/elasticache/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/elasticbeanstalk/endpoints_test.go b/service/elasticbeanstalk/endpoints_test.go index 22223d1ee9d..93a08724254 100644 --- a/service/elasticbeanstalk/endpoints_test.go +++ b/service/elasticbeanstalk/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1642,14 +1562,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1701,14 +1619,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1760,14 +1676,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/elasticbeanstalk/generated.json b/service/elasticbeanstalk/generated.json index 9e5d9152429..681e2d11353 100644 --- a/service/elasticbeanstalk/generated.json +++ b/service/elasticbeanstalk/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/elasticbeanstalk/go.mod b/service/elasticbeanstalk/go.mod index 82adef54bef..432fc2aac4e 100644 --- a/service/elasticbeanstalk/go.mod +++ b/service/elasticbeanstalk/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/elasticbeanstalk/go.sum b/service/elasticbeanstalk/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/elasticbeanstalk/go.sum +++ b/service/elasticbeanstalk/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/elasticinference/endpoints_test.go b/service/elasticinference/endpoints_test.go index e858b5f6f3f..d49380e163a 100644 --- a/service/elasticinference/endpoints_test.go +++ b/service/elasticinference/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -725,14 +691,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -784,14 +748,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -843,14 +805,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -902,14 +862,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +900,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/elasticinference/generated.json b/service/elasticinference/generated.json index 564a3f2a590..e75ac5dcf4d 100644 --- a/service/elasticinference/generated.json +++ b/service/elasticinference/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/elasticinference/go.mod b/service/elasticinference/go.mod index 6153a3b44cf..946e567066f 100644 --- a/service/elasticinference/go.mod +++ b/service/elasticinference/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/elasticinference/go.sum b/service/elasticinference/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/elasticinference/go.sum +++ b/service/elasticinference/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/elasticloadbalancing/endpoints_test.go b/service/elasticloadbalancing/endpoints_test.go index 69fa125da47..597be49f6ef 100644 --- a/service/elasticloadbalancing/endpoints_test.go +++ b/service/elasticloadbalancing/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/elasticloadbalancing/generated.json b/service/elasticloadbalancing/generated.json index 60c16ae9f4a..a00f16d4829 100644 --- a/service/elasticloadbalancing/generated.json +++ b/service/elasticloadbalancing/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/elasticloadbalancing/go.mod b/service/elasticloadbalancing/go.mod index 529dfe5ee64..dd4c6096a2d 100644 --- a/service/elasticloadbalancing/go.mod +++ b/service/elasticloadbalancing/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/elasticloadbalancing/go.sum b/service/elasticloadbalancing/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/elasticloadbalancing/go.sum +++ b/service/elasticloadbalancing/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/elasticloadbalancingv2/endpoints_test.go b/service/elasticloadbalancingv2/endpoints_test.go index b5ee123c045..eb11af0bf14 100644 --- a/service/elasticloadbalancingv2/endpoints_test.go +++ b/service/elasticloadbalancingv2/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/elasticloadbalancingv2/generated.json b/service/elasticloadbalancingv2/generated.json index fe10bb91314..47080cb4547 100644 --- a/service/elasticloadbalancingv2/generated.json +++ b/service/elasticloadbalancingv2/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/elasticloadbalancingv2/go.mod b/service/elasticloadbalancingv2/go.mod index e7706b3a9ce..526e887a954 100644 --- a/service/elasticloadbalancingv2/go.mod +++ b/service/elasticloadbalancingv2/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/elasticloadbalancingv2/go.sum b/service/elasticloadbalancingv2/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/elasticloadbalancingv2/go.sum +++ b/service/elasticloadbalancingv2/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/elasticsearchservice/endpoints_test.go b/service/elasticsearchservice/endpoints_test.go index a73ae072fd3..ab0c17a9f57 100644 --- a/service/elasticsearchservice/endpoints_test.go +++ b/service/elasticsearchservice/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/elasticsearchservice/generated.json b/service/elasticsearchservice/generated.json index cfa662598bb..1dd0eb10348 100644 --- a/service/elasticsearchservice/generated.json +++ b/service/elasticsearchservice/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/elasticsearchservice/go.mod b/service/elasticsearchservice/go.mod index 98e33959079..f4679ddd745 100644 --- a/service/elasticsearchservice/go.mod +++ b/service/elasticsearchservice/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/elasticsearchservice/go.sum b/service/elasticsearchservice/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/elasticsearchservice/go.sum +++ b/service/elasticsearchservice/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/elastictranscoder/endpoints_test.go b/service/elastictranscoder/endpoints_test.go index e6c24d4d787..c6cc810393f 100644 --- a/service/elastictranscoder/endpoints_test.go +++ b/service/elastictranscoder/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -803,14 +765,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -862,14 +822,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -921,14 +879,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -980,14 +936,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1020,14 +974,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1059,14 +1011,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/elastictranscoder/generated.json b/service/elastictranscoder/generated.json index 85ec281a8ee..afdad7e85f5 100644 --- a/service/elastictranscoder/generated.json +++ b/service/elastictranscoder/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/elastictranscoder/go.mod b/service/elastictranscoder/go.mod index 02982dc94cd..7c99cc4e72e 100644 --- a/service/elastictranscoder/go.mod +++ b/service/elastictranscoder/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/elastictranscoder/go.sum b/service/elastictranscoder/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/elastictranscoder/go.sum +++ b/service/elastictranscoder/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/emr/endpoints_test.go b/service/emr/endpoints_test.go index 60aafe14d3c..aed10f145b4 100644 --- a/service/emr/endpoints_test.go +++ b/service/emr/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1641,14 +1559,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1700,14 +1616,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1759,14 +1673,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1818,14 +1730,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1917,14 +1825,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/emr/generated.json b/service/emr/generated.json index d8de8b263dc..01a159240fe 100644 --- a/service/emr/generated.json +++ b/service/emr/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/emr/go.mod b/service/emr/go.mod index 28399ec2e55..9406140583a 100644 --- a/service/emr/go.mod +++ b/service/emr/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/emr/go.sum b/service/emr/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/emr/go.sum +++ b/service/emr/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/emrcontainers/endpoints_test.go b/service/emrcontainers/endpoints_test.go index 432cb77f07f..a6006f91726 100644 --- a/service/emrcontainers/endpoints_test.go +++ b/service/emrcontainers/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1310,14 +1246,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1369,14 +1303,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1428,14 +1360,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1487,14 +1417,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1527,14 +1455,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/emrcontainers/generated.json b/service/emrcontainers/generated.json index 95517e70064..39f9914fa2c 100644 --- a/service/emrcontainers/generated.json +++ b/service/emrcontainers/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/emrcontainers/go.mod b/service/emrcontainers/go.mod index 5da68e698b9..5db94183286 100644 --- a/service/emrcontainers/go.mod +++ b/service/emrcontainers/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/emrcontainers/go.sum b/service/emrcontainers/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/emrcontainers/go.sum +++ b/service/emrcontainers/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/emrserverless/endpoints_test.go b/service/emrserverless/endpoints_test.go index 06377bbac8b..244cfd979e7 100644 --- a/service/emrserverless/endpoints_test.go +++ b/service/emrserverless/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -686,14 +654,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -745,14 +711,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -804,14 +768,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -863,14 +825,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -903,14 +863,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +900,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/emrserverless/generated.json b/service/emrserverless/generated.json index 42c9fd51fd9..e00aba0cb2e 100644 --- a/service/emrserverless/generated.json +++ b/service/emrserverless/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/emrserverless/go.mod b/service/emrserverless/go.mod index aeb00db7523..125fe44b15c 100644 --- a/service/emrserverless/go.mod +++ b/service/emrserverless/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/emrserverless/go.sum b/service/emrserverless/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/emrserverless/go.sum +++ b/service/emrserverless/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/entityresolution/endpoints_test.go b/service/entityresolution/endpoints_test.go index 91e02ac796f..1fe84a23aa9 100644 --- a/service/entityresolution/endpoints_test.go +++ b/service/entityresolution/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/entityresolution/generated.json b/service/entityresolution/generated.json index d9a2ee63101..7fc8856702c 100644 --- a/service/entityresolution/generated.json +++ b/service/entityresolution/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/entityresolution/go.mod b/service/entityresolution/go.mod index 8b669334cbe..d852c905ce2 100644 --- a/service/entityresolution/go.mod +++ b/service/entityresolution/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/entityresolution/go.sum b/service/entityresolution/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/entityresolution/go.sum +++ b/service/entityresolution/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/eventbridge/endpoints_test.go b/service/eventbridge/endpoints_test.go index 999b56cde8d..f1faea265e9 100644 --- a/service/eventbridge/endpoints_test.go +++ b/service/eventbridge/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -44,14 +44,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -83,14 +81,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -122,14 +118,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -161,14 +155,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -200,14 +192,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -239,14 +229,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -278,14 +266,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -317,14 +303,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -356,14 +340,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -395,14 +377,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -434,14 +414,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -473,14 +451,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -512,14 +488,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -551,14 +525,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -590,14 +562,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -629,14 +599,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -668,14 +636,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +673,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -746,14 +710,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -785,14 +747,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -824,14 +784,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -863,14 +821,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -902,14 +858,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -941,14 +895,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -980,14 +932,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1019,14 +969,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1058,14 +1006,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1097,14 +1043,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1136,14 +1080,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1175,14 +1117,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1214,14 +1154,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1253,14 +1191,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1292,14 +1228,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1331,14 +1265,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1370,14 +1302,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1409,14 +1339,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1448,14 +1376,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1487,14 +1413,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1526,14 +1450,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1565,14 +1487,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1604,14 +1524,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1663,14 +1581,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1722,14 +1638,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1781,14 +1695,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1841,14 +1753,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1880,14 +1790,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1994,14 +1902,12 @@ func TestEndpointCase53(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2134,14 +2040,12 @@ func TestEndpointCase58(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2191,14 +2095,12 @@ func TestEndpointCase59(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/eventbridge/generated.json b/service/eventbridge/generated.json index 248d34fc395..6612eb59508 100644 --- a/service/eventbridge/generated.json +++ b/service/eventbridge/generated.json @@ -4,8 +4,7 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/v4a": "v0.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/eventbridge/go.mod b/service/eventbridge/go.mod index a143ca3c62b..e9f97533496 100644 --- a/service/eventbridge/go.mod +++ b/service/eventbridge/go.mod @@ -8,7 +8,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/eventbridge/go.sum b/service/eventbridge/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/eventbridge/go.sum +++ b/service/eventbridge/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/evidently/endpoints_test.go b/service/evidently/endpoints_test.go index 359e2875ab1..66aa4cf6f3d 100644 --- a/service/evidently/endpoints_test.go +++ b/service/evidently/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -842,14 +802,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -901,14 +859,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -960,14 +916,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1019,14 +973,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1059,14 +1011,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1098,14 +1048,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/evidently/generated.json b/service/evidently/generated.json index ecf15594b56..c32ebf0aa8a 100644 --- a/service/evidently/generated.json +++ b/service/evidently/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/evidently/go.mod b/service/evidently/go.mod index b011eeab801..c582683d3b0 100644 --- a/service/evidently/go.mod +++ b/service/evidently/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/evidently/go.sum b/service/evidently/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/evidently/go.sum +++ b/service/evidently/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/finspace/endpoints_test.go b/service/finspace/endpoints_test.go index aa56f816029..202588579f5 100644 --- a/service/finspace/endpoints_test.go +++ b/service/finspace/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -686,14 +654,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -745,14 +711,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -804,14 +768,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -863,14 +825,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -903,14 +863,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +900,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/finspace/generated.json b/service/finspace/generated.json index 1d0d4230fda..46731dca097 100644 --- a/service/finspace/generated.json +++ b/service/finspace/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/finspace/go.mod b/service/finspace/go.mod index cbd709f31c1..7a7bc34feb6 100644 --- a/service/finspace/go.mod +++ b/service/finspace/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/finspace/go.sum b/service/finspace/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/finspace/go.sum +++ b/service/finspace/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/finspacedata/endpoints_test.go b/service/finspacedata/endpoints_test.go index 118ae9c4022..d23665366c3 100644 --- a/service/finspacedata/endpoints_test.go +++ b/service/finspacedata/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -686,14 +654,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -745,14 +711,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -804,14 +768,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -863,14 +825,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -903,14 +863,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +900,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/finspacedata/generated.json b/service/finspacedata/generated.json index 5861191f424..24795c498b7 100644 --- a/service/finspacedata/generated.json +++ b/service/finspacedata/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/finspacedata/go.mod b/service/finspacedata/go.mod index 586aec31101..cc3f991d5fc 100644 --- a/service/finspacedata/go.mod +++ b/service/finspacedata/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/finspacedata/go.sum b/service/finspacedata/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/finspacedata/go.sum +++ b/service/finspacedata/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/firehose/endpoints_test.go b/service/firehose/endpoints_test.go index a5e6c01541c..f2b4d02bb87 100644 --- a/service/firehose/endpoints_test.go +++ b/service/firehose/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1622,14 +1542,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1701,14 +1619,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1760,14 +1676,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/firehose/generated.json b/service/firehose/generated.json index 1a44331a8bf..9633fd45100 100644 --- a/service/firehose/generated.json +++ b/service/firehose/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/firehose/go.mod b/service/firehose/go.mod index e1fc80ef6f6..dbd55626804 100644 --- a/service/firehose/go.mod +++ b/service/firehose/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/firehose/go.sum b/service/firehose/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/firehose/go.sum +++ b/service/firehose/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/fis/endpoints_test.go b/service/fis/endpoints_test.go index 0fea28d5603..8bbd003364e 100644 --- a/service/fis/endpoints_test.go +++ b/service/fis/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -608,14 +580,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -667,14 +637,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -726,14 +694,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -785,14 +751,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -864,14 +826,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/fis/generated.json b/service/fis/generated.json index f081b1ddd0b..a8d7116a891 100644 --- a/service/fis/generated.json +++ b/service/fis/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/fis/go.mod b/service/fis/go.mod index 36e76b4d03f..20c955a73f9 100644 --- a/service/fis/go.mod +++ b/service/fis/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/fis/go.sum b/service/fis/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/fis/go.sum +++ b/service/fis/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/fms/endpoints_test.go b/service/fms/endpoints_test.go index 633a44f37eb..bf9bfe7c240 100644 --- a/service/fms/endpoints_test.go +++ b/service/fms/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1641,14 +1559,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1680,14 +1596,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1719,14 +1633,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1758,14 +1670,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1797,14 +1707,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1836,14 +1744,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1875,14 +1781,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1914,14 +1818,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1953,14 +1855,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1992,14 +1892,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2031,14 +1929,12 @@ func TestEndpointCase51(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2070,14 +1966,12 @@ func TestEndpointCase52(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2129,14 +2023,12 @@ func TestEndpointCase54(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2188,14 +2080,12 @@ func TestEndpointCase56(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2247,14 +2137,12 @@ func TestEndpointCase58(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2306,14 +2194,12 @@ func TestEndpointCase60(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2346,14 +2232,12 @@ func TestEndpointCase61(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2385,14 +2269,12 @@ func TestEndpointCase62(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/fms/generated.json b/service/fms/generated.json index 331089e7b22..9bf2c4a91d0 100644 --- a/service/fms/generated.json +++ b/service/fms/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/fms/go.mod b/service/fms/go.mod index 16331efa313..f2aaab35ce1 100644 --- a/service/fms/go.mod +++ b/service/fms/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/fms/go.sum b/service/fms/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/fms/go.sum +++ b/service/fms/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/forecast/endpoints_test.go b/service/forecast/endpoints_test.go index 0c0df22ed7d..8d71a56458e 100644 --- a/service/forecast/endpoints_test.go +++ b/service/forecast/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -959,14 +913,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1018,14 +970,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1077,14 +1027,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1136,14 +1084,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1215,14 +1159,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/forecast/generated.json b/service/forecast/generated.json index b7dcbb61c89..f328395837f 100644 --- a/service/forecast/generated.json +++ b/service/forecast/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/forecast/go.mod b/service/forecast/go.mod index d265fe1944f..a78ce57c93c 100644 --- a/service/forecast/go.mod +++ b/service/forecast/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/forecast/go.sum b/service/forecast/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/forecast/go.sum +++ b/service/forecast/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/forecastquery/endpoints_test.go b/service/forecastquery/endpoints_test.go index d877198594f..17890821e8a 100644 --- a/service/forecastquery/endpoints_test.go +++ b/service/forecastquery/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -959,14 +913,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1018,14 +970,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1077,14 +1027,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1136,14 +1084,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1215,14 +1159,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/forecastquery/generated.json b/service/forecastquery/generated.json index 398b6c264f2..9279aba14a6 100644 --- a/service/forecastquery/generated.json +++ b/service/forecastquery/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/forecastquery/go.mod b/service/forecastquery/go.mod index 5f690b2e797..6766684aba0 100644 --- a/service/forecastquery/go.mod +++ b/service/forecastquery/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/forecastquery/go.sum b/service/forecastquery/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/forecastquery/go.sum +++ b/service/forecastquery/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/frauddetector/endpoints_test.go b/service/frauddetector/endpoints_test.go index f6e09c79783..041ebfba5fe 100644 --- a/service/frauddetector/endpoints_test.go +++ b/service/frauddetector/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -725,14 +691,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -784,14 +748,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -843,14 +805,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -902,14 +862,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +900,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/frauddetector/generated.json b/service/frauddetector/generated.json index 4478971940a..ff774e33350 100644 --- a/service/frauddetector/generated.json +++ b/service/frauddetector/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/frauddetector/go.mod b/service/frauddetector/go.mod index 4d86ef05d64..48da9574702 100644 --- a/service/frauddetector/go.mod +++ b/service/frauddetector/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/frauddetector/go.sum b/service/frauddetector/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/frauddetector/go.sum +++ b/service/frauddetector/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/freetier/endpoints_test.go b/service/freetier/endpoints_test.go index d86c08afe3c..a3a4231c2b9 100644 --- a/service/freetier/endpoints_test.go +++ b/service/freetier/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -59,14 +59,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -97,14 +95,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -151,14 +147,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -205,14 +199,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -243,14 +235,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -281,14 +271,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -319,14 +307,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -357,14 +343,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -396,14 +380,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -434,14 +416,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/freetier/generated.json b/service/freetier/generated.json index 19ef1630305..3844ee269f6 100644 --- a/service/freetier/generated.json +++ b/service/freetier/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/freetier/go.mod b/service/freetier/go.mod index 57bd7d3e466..8b2576eede5 100644 --- a/service/freetier/go.mod +++ b/service/freetier/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/freetier/go.sum b/service/freetier/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/freetier/go.sum +++ b/service/freetier/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/fsx/endpoints_test.go b/service/fsx/endpoints_test.go index 5ef1a56aa17..b891cf940df 100644 --- a/service/fsx/endpoints_test.go +++ b/service/fsx/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1642,14 +1562,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1701,14 +1619,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1760,14 +1676,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/fsx/generated.json b/service/fsx/generated.json index c51d51bc1be..1a4e076182d 100644 --- a/service/fsx/generated.json +++ b/service/fsx/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/fsx/go.mod b/service/fsx/go.mod index 9de08e2c826..6d2542a735f 100644 --- a/service/fsx/go.mod +++ b/service/fsx/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/fsx/go.sum b/service/fsx/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/fsx/go.sum +++ b/service/fsx/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/gamelift/endpoints_test.go b/service/gamelift/endpoints_test.go index 350101a1577..0a4d0dcc190 100644 --- a/service/gamelift/endpoints_test.go +++ b/service/gamelift/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1349,14 +1283,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1408,14 +1340,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1467,14 +1397,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1526,14 +1454,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1605,14 +1529,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/gamelift/generated.json b/service/gamelift/generated.json index 24ad1bd2f47..e0abd4f7700 100644 --- a/service/gamelift/generated.json +++ b/service/gamelift/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/gamelift/go.mod b/service/gamelift/go.mod index d39f7543abe..9013c3cf9ed 100644 --- a/service/gamelift/go.mod +++ b/service/gamelift/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/gamelift/go.sum b/service/gamelift/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/gamelift/go.sum +++ b/service/gamelift/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/glacier/endpoints_test.go b/service/glacier/endpoints_test.go index 9404cb7d6fc..86991f9d052 100644 --- a/service/glacier/endpoints_test.go +++ b/service/glacier/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1641,14 +1559,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1700,14 +1616,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1759,14 +1673,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1818,14 +1730,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1917,14 +1825,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/glacier/generated.json b/service/glacier/generated.json index 45f118defe7..a0a5c7be1f2 100644 --- a/service/glacier/generated.json +++ b/service/glacier/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/glacier/go.mod b/service/glacier/go.mod index dde0da591f9..bafbeff4854 100644 --- a/service/glacier/go.mod +++ b/service/glacier/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/glacier/go.sum b/service/glacier/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/glacier/go.sum +++ b/service/glacier/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/globalaccelerator/endpoints_test.go b/service/globalaccelerator/endpoints_test.go index ce505505bc2..5531c3c5401 100644 --- a/service/globalaccelerator/endpoints_test.go +++ b/service/globalaccelerator/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/globalaccelerator/generated.json b/service/globalaccelerator/generated.json index 7c1cbb02925..d5e194941bd 100644 --- a/service/globalaccelerator/generated.json +++ b/service/globalaccelerator/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/globalaccelerator/go.mod b/service/globalaccelerator/go.mod index e0ce52a42dd..564874c8f02 100644 --- a/service/globalaccelerator/go.mod +++ b/service/globalaccelerator/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/globalaccelerator/go.sum b/service/globalaccelerator/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/globalaccelerator/go.sum +++ b/service/globalaccelerator/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/glue/endpoints_test.go b/service/glue/endpoints_test.go index 9812b4b4559..ae541a6878c 100644 --- a/service/glue/endpoints_test.go +++ b/service/glue/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1544,14 +1468,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1603,14 +1525,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1662,14 +1582,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1721,14 +1639,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1761,14 +1677,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/glue/generated.json b/service/glue/generated.json index d8285de485f..6a79354a070 100644 --- a/service/glue/generated.json +++ b/service/glue/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/glue/go.mod b/service/glue/go.mod index 8b285698eee..55a39c6de93 100644 --- a/service/glue/go.mod +++ b/service/glue/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/glue/go.sum b/service/glue/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/glue/go.sum +++ b/service/glue/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/grafana/endpoints_test.go b/service/grafana/endpoints_test.go index 8e8f4c2bbd0..f77ed15f3f2 100644 --- a/service/grafana/endpoints_test.go +++ b/service/grafana/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -881,14 +839,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -940,14 +896,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -999,14 +953,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1058,14 +1010,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1098,14 +1048,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/grafana/generated.json b/service/grafana/generated.json index 4d93932cb2d..bd2e0f0b922 100644 --- a/service/grafana/generated.json +++ b/service/grafana/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/grafana/go.mod b/service/grafana/go.mod index 9e3a2e42a10..58e0238fb19 100644 --- a/service/grafana/go.mod +++ b/service/grafana/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/grafana/go.sum b/service/grafana/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/grafana/go.sum +++ b/service/grafana/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/greengrass/endpoints_test.go b/service/greengrass/endpoints_test.go index 36d45139158..a742e3a93f6 100644 --- a/service/greengrass/endpoints_test.go +++ b/service/greengrass/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -44,14 +44,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -83,14 +81,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -122,14 +118,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -161,14 +155,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -200,14 +192,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -239,14 +229,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -278,14 +266,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -317,14 +303,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -356,14 +340,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -395,14 +377,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -434,14 +414,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -473,14 +451,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -512,14 +488,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -551,14 +525,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -590,14 +562,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -629,14 +599,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -668,14 +636,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +673,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -746,14 +710,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -801,14 +763,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -856,14 +816,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -895,14 +853,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -934,14 +890,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -973,14 +927,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1012,14 +964,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1051,14 +1001,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1090,14 +1038,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1149,14 +1095,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1208,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1267,14 +1209,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1326,14 +1266,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1366,14 +1304,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1405,14 +1341,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/greengrass/generated.json b/service/greengrass/generated.json index a795d74ac8b..8bbe544aba5 100644 --- a/service/greengrass/generated.json +++ b/service/greengrass/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/greengrass/go.mod b/service/greengrass/go.mod index e2a897a5bbe..858ade45599 100644 --- a/service/greengrass/go.mod +++ b/service/greengrass/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/greengrass/go.sum b/service/greengrass/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/greengrass/go.sum +++ b/service/greengrass/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/greengrassv2/endpoints_test.go b/service/greengrassv2/endpoints_test.go index a05113eb2d9..954102caa51 100644 --- a/service/greengrassv2/endpoints_test.go +++ b/service/greengrassv2/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -44,14 +44,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -83,14 +81,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -122,14 +118,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -161,14 +155,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -200,14 +192,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -239,14 +229,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -278,14 +266,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -317,14 +303,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -356,14 +340,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -395,14 +377,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -434,14 +414,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -473,14 +451,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -512,14 +488,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -551,14 +525,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -590,14 +562,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -629,14 +599,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -668,14 +636,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +673,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -746,14 +710,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -801,14 +763,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -856,14 +816,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -895,14 +853,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -934,14 +890,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -973,14 +927,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1012,14 +964,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1051,14 +1001,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1090,14 +1038,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1149,14 +1095,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1208,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1267,14 +1209,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1326,14 +1266,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1366,14 +1304,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1405,14 +1341,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/greengrassv2/generated.json b/service/greengrassv2/generated.json index 2d16a99215c..0c61e8d67b2 100644 --- a/service/greengrassv2/generated.json +++ b/service/greengrassv2/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/greengrassv2/go.mod b/service/greengrassv2/go.mod index 58cf5a7e1de..fad842f38cf 100644 --- a/service/greengrassv2/go.mod +++ b/service/greengrassv2/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/greengrassv2/go.sum b/service/greengrassv2/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/greengrassv2/go.sum +++ b/service/greengrassv2/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/groundstation/endpoints_test.go b/service/groundstation/endpoints_test.go index 09a5dc187fb..b2033f54be6 100644 --- a/service/groundstation/endpoints_test.go +++ b/service/groundstation/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -998,14 +950,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1057,14 +1007,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1116,14 +1064,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1175,14 +1121,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1215,14 +1159,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1254,14 +1196,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/groundstation/generated.json b/service/groundstation/generated.json index 806805b11bf..568f2b66e09 100644 --- a/service/groundstation/generated.json +++ b/service/groundstation/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/groundstation/go.mod b/service/groundstation/go.mod index 3ce68b13cd3..bdb04215199 100644 --- a/service/groundstation/go.mod +++ b/service/groundstation/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/groundstation/go.sum b/service/groundstation/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/groundstation/go.sum +++ b/service/groundstation/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/guardduty/endpoints_test.go b/service/guardduty/endpoints_test.go index 38f1594236d..51fc531bff0 100644 --- a/service/guardduty/endpoints_test.go +++ b/service/guardduty/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1642,14 +1562,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1701,14 +1619,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1760,14 +1676,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/guardduty/generated.json b/service/guardduty/generated.json index c27b931d958..b1a11c06030 100644 --- a/service/guardduty/generated.json +++ b/service/guardduty/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/guardduty/go.mod b/service/guardduty/go.mod index 9b04a3269cf..c68cae67910 100644 --- a/service/guardduty/go.mod +++ b/service/guardduty/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/guardduty/go.sum b/service/guardduty/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/guardduty/go.sum +++ b/service/guardduty/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/health/endpoints_test.go b/service/health/endpoints_test.go index ff1a182db3f..16885d370f5 100644 --- a/service/health/endpoints_test.go +++ b/service/health/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -60,14 +60,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -99,14 +97,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -138,14 +134,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -177,14 +171,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -216,14 +208,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -271,14 +261,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -310,14 +298,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -349,14 +335,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -388,14 +372,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -427,14 +409,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -466,14 +446,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -505,14 +483,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -544,14 +520,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -583,14 +557,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -622,14 +594,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -681,14 +651,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -740,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -799,14 +765,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -859,14 +823,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -898,14 +860,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/health/generated.json b/service/health/generated.json index 50f319c82fd..f6f5b630de0 100644 --- a/service/health/generated.json +++ b/service/health/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/health/go.mod b/service/health/go.mod index 0a18b4fbca2..9e345ca0c9b 100644 --- a/service/health/go.mod +++ b/service/health/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/health/go.sum b/service/health/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/health/go.sum +++ b/service/health/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/healthlake/endpoints_test.go b/service/healthlake/endpoints_test.go index f72c8e98082..83829ca3aa6 100644 --- a/service/healthlake/endpoints_test.go +++ b/service/healthlake/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -608,14 +580,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -667,14 +637,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -726,14 +694,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -785,14 +751,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -864,14 +826,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/healthlake/generated.json b/service/healthlake/generated.json index 911cc88562a..f163fce1dbf 100644 --- a/service/healthlake/generated.json +++ b/service/healthlake/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/healthlake/go.mod b/service/healthlake/go.mod index 420721fa78b..fe60c5f1f74 100644 --- a/service/healthlake/go.mod +++ b/service/healthlake/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/healthlake/go.sum b/service/healthlake/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/healthlake/go.sum +++ b/service/healthlake/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/honeycode/endpoints_test.go b/service/honeycode/endpoints_test.go index b1678441f01..2eac267e7b6 100644 --- a/service/honeycode/endpoints_test.go +++ b/service/honeycode/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -569,14 +543,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -628,14 +600,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -687,14 +657,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -746,14 +714,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/honeycode/generated.json b/service/honeycode/generated.json index 37b2fcb1a11..256dbbeb5cb 100644 --- a/service/honeycode/generated.json +++ b/service/honeycode/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/honeycode/go.mod b/service/honeycode/go.mod index 3d531bff87c..207846af237 100644 --- a/service/honeycode/go.mod +++ b/service/honeycode/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/honeycode/go.sum b/service/honeycode/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/honeycode/go.sum +++ b/service/honeycode/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/iam/endpoints_test.go b/service/iam/endpoints_test.go index 416634892dd..a8a396d2029 100644 --- a/service/iam/endpoints_test.go +++ b/service/iam/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -60,14 +60,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -115,14 +113,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -154,14 +150,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -209,14 +203,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -248,14 +240,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -303,14 +293,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -358,14 +346,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -397,14 +383,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -436,14 +420,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -475,14 +457,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +510,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -585,14 +563,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -640,14 +616,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -679,14 +653,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -734,14 +706,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -773,14 +743,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -828,14 +796,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -883,14 +849,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +906,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +979,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1072,14 +1032,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1131,14 +1089,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1206,14 +1162,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1261,14 +1215,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1316,14 +1268,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1356,14 +1306,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1395,14 +1343,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iam/generated.json b/service/iam/generated.json index 969cdc40511..26ce6bfcc09 100644 --- a/service/iam/generated.json +++ b/service/iam/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/iam/go.mod b/service/iam/go.mod index 252773e3c47..015673281bf 100644 --- a/service/iam/go.mod +++ b/service/iam/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iam/go.sum b/service/iam/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/iam/go.sum +++ b/service/iam/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/identitystore/endpoints_test.go b/service/identitystore/endpoints_test.go index 296edf2919c..eb8c6d3ff30 100644 --- a/service/identitystore/endpoints_test.go +++ b/service/identitystore/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1076,14 +1024,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1135,14 +1081,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1194,14 +1138,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1253,14 +1195,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1293,14 +1233,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/identitystore/generated.json b/service/identitystore/generated.json index 1f8af789d3e..cd618835115 100644 --- a/service/identitystore/generated.json +++ b/service/identitystore/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/identitystore/go.mod b/service/identitystore/go.mod index afbe86ac134..42ee0011641 100644 --- a/service/identitystore/go.mod +++ b/service/identitystore/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/identitystore/go.sum b/service/identitystore/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/identitystore/go.sum +++ b/service/identitystore/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/imagebuilder/endpoints_test.go b/service/imagebuilder/endpoints_test.go index 13dc172c9ec..eaaa1ad17d0 100644 --- a/service/imagebuilder/endpoints_test.go +++ b/service/imagebuilder/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -608,14 +580,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -667,14 +637,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -726,14 +694,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -785,14 +751,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -864,14 +826,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/imagebuilder/generated.json b/service/imagebuilder/generated.json index f89058cacb4..e74adfeb7da 100644 --- a/service/imagebuilder/generated.json +++ b/service/imagebuilder/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/imagebuilder/go.mod b/service/imagebuilder/go.mod index e2804fec471..4e7b0a1a856 100644 --- a/service/imagebuilder/go.mod +++ b/service/imagebuilder/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/imagebuilder/go.sum b/service/imagebuilder/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/imagebuilder/go.sum +++ b/service/imagebuilder/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/inspector/endpoints_test.go b/service/inspector/endpoints_test.go index 2ce1792b3bb..5f2d3500912 100644 --- a/service/inspector/endpoints_test.go +++ b/service/inspector/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1154,14 +1098,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1213,14 +1155,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1272,14 +1212,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1331,14 +1269,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1410,14 +1344,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/inspector/generated.json b/service/inspector/generated.json index 98b5fe7a25a..4efc9f761b0 100644 --- a/service/inspector/generated.json +++ b/service/inspector/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/inspector/go.mod b/service/inspector/go.mod index 447d8b55263..16d4ec3f756 100644 --- a/service/inspector/go.mod +++ b/service/inspector/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/inspector/go.sum b/service/inspector/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/inspector/go.sum +++ b/service/inspector/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/inspector2/endpoints_test.go b/service/inspector2/endpoints_test.go index d3006d47a42..a500355ea7d 100644 --- a/service/inspector2/endpoints_test.go +++ b/service/inspector2/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1232,14 +1172,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1291,14 +1229,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1350,14 +1286,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1409,14 +1343,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1449,14 +1381,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1488,14 +1418,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/inspector2/generated.json b/service/inspector2/generated.json index 14af46b7b98..0923ea87edb 100644 --- a/service/inspector2/generated.json +++ b/service/inspector2/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/inspector2/go.mod b/service/inspector2/go.mod index b201be8a87d..747cd86a4b6 100644 --- a/service/inspector2/go.mod +++ b/service/inspector2/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/inspector2/go.sum b/service/inspector2/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/inspector2/go.sum +++ b/service/inspector2/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/inspectorscan/endpoints_test.go b/service/inspectorscan/endpoints_test.go index 617818c550e..e76820d18c6 100644 --- a/service/inspectorscan/endpoints_test.go +++ b/service/inspectorscan/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/inspectorscan/generated.json b/service/inspectorscan/generated.json index 700512f8bc6..32f295a52bf 100644 --- a/service/inspectorscan/generated.json +++ b/service/inspectorscan/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/inspectorscan/go.mod b/service/inspectorscan/go.mod index 4b336b63e38..ec6bd7de99c 100644 --- a/service/inspectorscan/go.mod +++ b/service/inspectorscan/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/inspectorscan/go.sum b/service/inspectorscan/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/inspectorscan/go.sum +++ b/service/inspectorscan/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/internal/endpoint-discovery/go.sum b/service/internal/endpoint-discovery/go.sum index d5d61042cef..a0cddd7b526 100644 --- a/service/internal/endpoint-discovery/go.sum +++ b/service/internal/endpoint-discovery/go.sum @@ -1,3 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= diff --git a/service/internal/eventstreamtesting/go.sum b/service/internal/eventstreamtesting/go.sum index 440149c6418..5a8520aaca4 100644 --- a/service/internal/eventstreamtesting/go.sum +++ b/service/internal/eventstreamtesting/go.sum @@ -1,6 +1,5 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= diff --git a/service/internal/s3shared/go.sum b/service/internal/s3shared/go.sum index d5d61042cef..a0cddd7b526 100644 --- a/service/internal/s3shared/go.sum +++ b/service/internal/s3shared/go.sum @@ -1,3 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= diff --git a/service/internetmonitor/endpoints_test.go b/service/internetmonitor/endpoints_test.go index 717f6206f59..3601fff8c23 100644 --- a/service/internetmonitor/endpoints_test.go +++ b/service/internetmonitor/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/internetmonitor/generated.json b/service/internetmonitor/generated.json index 70c4b49dbb5..e05c205429a 100644 --- a/service/internetmonitor/generated.json +++ b/service/internetmonitor/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/internetmonitor/go.mod b/service/internetmonitor/go.mod index 33aa2721b05..307ba64d436 100644 --- a/service/internetmonitor/go.mod +++ b/service/internetmonitor/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/internetmonitor/go.sum b/service/internetmonitor/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/internetmonitor/go.sum +++ b/service/internetmonitor/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/iot/endpoints_test.go b/service/iot/endpoints_test.go index 9678f146e9b..d7691a62ee5 100644 --- a/service/iot/endpoints_test.go +++ b/service/iot/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1466,14 +1394,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1525,14 +1451,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1584,14 +1508,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1643,14 +1565,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1722,14 +1640,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iot/generated.json b/service/iot/generated.json index 1de7dbaeb35..39c6ea62b59 100644 --- a/service/iot/generated.json +++ b/service/iot/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/iot/go.mod b/service/iot/go.mod index 4bd16abef0a..6f7d4aeeee2 100644 --- a/service/iot/go.mod +++ b/service/iot/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iot/go.sum b/service/iot/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/iot/go.sum +++ b/service/iot/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/iot1clickdevicesservice/endpoints_test.go b/service/iot1clickdevicesservice/endpoints_test.go index 2aaa4fec583..2f5247cb65b 100644 --- a/service/iot1clickdevicesservice/endpoints_test.go +++ b/service/iot1clickdevicesservice/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iot1clickdevicesservice/generated.json b/service/iot1clickdevicesservice/generated.json index f08385bbb08..58a92ecf760 100644 --- a/service/iot1clickdevicesservice/generated.json +++ b/service/iot1clickdevicesservice/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/iot1clickdevicesservice/go.mod b/service/iot1clickdevicesservice/go.mod index 2cec5757faf..75dbf215cd7 100644 --- a/service/iot1clickdevicesservice/go.mod +++ b/service/iot1clickdevicesservice/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iot1clickdevicesservice/go.sum b/service/iot1clickdevicesservice/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/iot1clickdevicesservice/go.sum +++ b/service/iot1clickdevicesservice/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/iot1clickprojects/endpoints_test.go b/service/iot1clickprojects/endpoints_test.go index b5c1084a793..daf83c96282 100644 --- a/service/iot1clickprojects/endpoints_test.go +++ b/service/iot1clickprojects/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -764,14 +728,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -823,14 +785,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -882,14 +842,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -941,14 +899,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1020,14 +974,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iot1clickprojects/generated.json b/service/iot1clickprojects/generated.json index 4c9009d5a3d..f234628d986 100644 --- a/service/iot1clickprojects/generated.json +++ b/service/iot1clickprojects/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/iot1clickprojects/go.mod b/service/iot1clickprojects/go.mod index 2d993abce8e..0f33da45784 100644 --- a/service/iot1clickprojects/go.mod +++ b/service/iot1clickprojects/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iot1clickprojects/go.sum b/service/iot1clickprojects/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/iot1clickprojects/go.sum +++ b/service/iot1clickprojects/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/iotanalytics/endpoints_test.go b/service/iotanalytics/endpoints_test.go index 2067f8a942b..7a2ca342bdb 100644 --- a/service/iotanalytics/endpoints_test.go +++ b/service/iotanalytics/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -803,14 +765,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -862,14 +822,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -921,14 +879,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -980,14 +936,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1020,14 +974,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1059,14 +1011,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iotanalytics/generated.json b/service/iotanalytics/generated.json index d1d3a436df4..f1b3a8b5cd2 100644 --- a/service/iotanalytics/generated.json +++ b/service/iotanalytics/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/iotanalytics/go.mod b/service/iotanalytics/go.mod index 4af0106a24a..4d3d58db4df 100644 --- a/service/iotanalytics/go.mod +++ b/service/iotanalytics/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotanalytics/go.sum b/service/iotanalytics/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/iotanalytics/go.sum +++ b/service/iotanalytics/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/iotdataplane/endpoints_test.go b/service/iotdataplane/endpoints_test.go index 89570fed420..242d281dfda 100644 --- a/service/iotdataplane/endpoints_test.go +++ b/service/iotdataplane/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1466,14 +1394,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1525,14 +1451,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1584,14 +1508,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1643,14 +1565,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1722,14 +1640,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iotdataplane/generated.json b/service/iotdataplane/generated.json index 4732ed09c84..df3f8723f92 100644 --- a/service/iotdataplane/generated.json +++ b/service/iotdataplane/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/iotdataplane/go.mod b/service/iotdataplane/go.mod index 329a5cb24bc..190fd033d56 100644 --- a/service/iotdataplane/go.mod +++ b/service/iotdataplane/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotdataplane/go.sum b/service/iotdataplane/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/iotdataplane/go.sum +++ b/service/iotdataplane/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/iotdeviceadvisor/endpoints_test.go b/service/iotdeviceadvisor/endpoints_test.go index 1341abbe089..51aa591fb39 100644 --- a/service/iotdeviceadvisor/endpoints_test.go +++ b/service/iotdeviceadvisor/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -647,14 +617,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -706,14 +674,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -765,14 +731,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -824,14 +788,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -864,14 +826,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -903,14 +863,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iotdeviceadvisor/generated.json b/service/iotdeviceadvisor/generated.json index cf24573db78..1c450529ec7 100644 --- a/service/iotdeviceadvisor/generated.json +++ b/service/iotdeviceadvisor/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/iotdeviceadvisor/go.mod b/service/iotdeviceadvisor/go.mod index f17e7b809ed..0cc49168e2e 100644 --- a/service/iotdeviceadvisor/go.mod +++ b/service/iotdeviceadvisor/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotdeviceadvisor/go.sum b/service/iotdeviceadvisor/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/iotdeviceadvisor/go.sum +++ b/service/iotdeviceadvisor/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/iotevents/endpoints_test.go b/service/iotevents/endpoints_test.go index 0edf23825f4..a991ab53b02 100644 --- a/service/iotevents/endpoints_test.go +++ b/service/iotevents/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -998,14 +950,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1057,14 +1007,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1116,14 +1064,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1175,14 +1121,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1215,14 +1159,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1254,14 +1196,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iotevents/generated.json b/service/iotevents/generated.json index a75bfb7ae70..751ef68d4ef 100644 --- a/service/iotevents/generated.json +++ b/service/iotevents/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/iotevents/go.mod b/service/iotevents/go.mod index 5e61c4f3d8d..b2065d67dcb 100644 --- a/service/iotevents/go.mod +++ b/service/iotevents/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotevents/go.sum b/service/iotevents/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/iotevents/go.sum +++ b/service/iotevents/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/ioteventsdata/endpoints_test.go b/service/ioteventsdata/endpoints_test.go index 4e88ad37995..7257a78b019 100644 --- a/service/ioteventsdata/endpoints_test.go +++ b/service/ioteventsdata/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ioteventsdata/generated.json b/service/ioteventsdata/generated.json index c03c12899ee..76d67cad51e 100644 --- a/service/ioteventsdata/generated.json +++ b/service/ioteventsdata/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/ioteventsdata/go.mod b/service/ioteventsdata/go.mod index 7a99e31e329..81bb8d5804a 100644 --- a/service/ioteventsdata/go.mod +++ b/service/ioteventsdata/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ioteventsdata/go.sum b/service/ioteventsdata/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/ioteventsdata/go.sum +++ b/service/ioteventsdata/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/iotfleethub/endpoints_test.go b/service/iotfleethub/endpoints_test.go index 99dba8be7db..a278842b059 100644 --- a/service/iotfleethub/endpoints_test.go +++ b/service/iotfleethub/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1115,14 +1061,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1174,14 +1118,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1233,14 +1175,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1292,14 +1232,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iotfleethub/generated.json b/service/iotfleethub/generated.json index 7913f559e89..4d778a6f68f 100644 --- a/service/iotfleethub/generated.json +++ b/service/iotfleethub/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/iotfleethub/go.mod b/service/iotfleethub/go.mod index 516cff53b56..c538426a8a6 100644 --- a/service/iotfleethub/go.mod +++ b/service/iotfleethub/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotfleethub/go.sum b/service/iotfleethub/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/iotfleethub/go.sum +++ b/service/iotfleethub/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/iotfleetwise/endpoints_test.go b/service/iotfleetwise/endpoints_test.go index 97ab837325c..8762c60afe2 100644 --- a/service/iotfleetwise/endpoints_test.go +++ b/service/iotfleetwise/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -569,14 +543,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -628,14 +600,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -687,14 +657,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -746,14 +714,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iotfleetwise/generated.json b/service/iotfleetwise/generated.json index f19f6d64165..7620c8f900a 100644 --- a/service/iotfleetwise/generated.json +++ b/service/iotfleetwise/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/iotfleetwise/go.mod b/service/iotfleetwise/go.mod index 728e32db74d..c3cfd5bdf54 100644 --- a/service/iotfleetwise/go.mod +++ b/service/iotfleetwise/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotfleetwise/go.sum b/service/iotfleetwise/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/iotfleetwise/go.sum +++ b/service/iotfleetwise/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/iotjobsdataplane/endpoints_test.go b/service/iotjobsdataplane/endpoints_test.go index db36884fdee..03ebf41eae7 100644 --- a/service/iotjobsdataplane/endpoints_test.go +++ b/service/iotjobsdataplane/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1466,14 +1394,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1525,14 +1451,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1584,14 +1508,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1643,14 +1565,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1722,14 +1640,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iotjobsdataplane/generated.json b/service/iotjobsdataplane/generated.json index 9acf062f147..aebab8cf682 100644 --- a/service/iotjobsdataplane/generated.json +++ b/service/iotjobsdataplane/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/iotjobsdataplane/go.mod b/service/iotjobsdataplane/go.mod index d5ed200b393..fe56b0fd493 100644 --- a/service/iotjobsdataplane/go.mod +++ b/service/iotjobsdataplane/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotjobsdataplane/go.sum b/service/iotjobsdataplane/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/iotjobsdataplane/go.sum +++ b/service/iotjobsdataplane/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/iotroborunner/endpoints_test.go b/service/iotroborunner/endpoints_test.go index 9e7d15f4d2f..96b7ac56bd8 100644 --- a/service/iotroborunner/endpoints_test.go +++ b/service/iotroborunner/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iotroborunner/generated.json b/service/iotroborunner/generated.json index 6b39fa5a5b7..619bb312bf1 100644 --- a/service/iotroborunner/generated.json +++ b/service/iotroborunner/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/iotroborunner/go.mod b/service/iotroborunner/go.mod index f977b5b7b5d..596542b3218 100644 --- a/service/iotroborunner/go.mod +++ b/service/iotroborunner/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotroborunner/go.sum b/service/iotroborunner/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/iotroborunner/go.sum +++ b/service/iotroborunner/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/iotsecuretunneling/endpoints_test.go b/service/iotsecuretunneling/endpoints_test.go index c55df2059df..e277b9dede4 100644 --- a/service/iotsecuretunneling/endpoints_test.go +++ b/service/iotsecuretunneling/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1466,14 +1394,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1525,14 +1451,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1584,14 +1508,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1643,14 +1565,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1722,14 +1640,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iotsecuretunneling/generated.json b/service/iotsecuretunneling/generated.json index 9e66753097f..b4aa9e7729c 100644 --- a/service/iotsecuretunneling/generated.json +++ b/service/iotsecuretunneling/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/iotsecuretunneling/go.mod b/service/iotsecuretunneling/go.mod index bf73e61f0e3..309171155f8 100644 --- a/service/iotsecuretunneling/go.mod +++ b/service/iotsecuretunneling/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotsecuretunneling/go.sum b/service/iotsecuretunneling/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/iotsecuretunneling/go.sum +++ b/service/iotsecuretunneling/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/iotsitewise/endpoints_test.go b/service/iotsitewise/endpoints_test.go index 2901062bbd0..7d080c3fcbf 100644 --- a/service/iotsitewise/endpoints_test.go +++ b/service/iotsitewise/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1115,14 +1061,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1174,14 +1118,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1233,14 +1175,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1292,14 +1232,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iotsitewise/generated.json b/service/iotsitewise/generated.json index db9433b9f8a..7df12afae70 100644 --- a/service/iotsitewise/generated.json +++ b/service/iotsitewise/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/iotsitewise/go.mod b/service/iotsitewise/go.mod index e8373aac5f9..19c52fba79c 100644 --- a/service/iotsitewise/go.mod +++ b/service/iotsitewise/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/iotsitewise/go.sum b/service/iotsitewise/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/iotsitewise/go.sum +++ b/service/iotsitewise/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/iotthingsgraph/endpoints_test.go b/service/iotthingsgraph/endpoints_test.go index bdbc483da6c..b045f790d25 100644 --- a/service/iotthingsgraph/endpoints_test.go +++ b/service/iotthingsgraph/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -725,14 +691,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -784,14 +748,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -843,14 +805,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -902,14 +862,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +900,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iotthingsgraph/generated.json b/service/iotthingsgraph/generated.json index a6c53106204..6cae64e0f0d 100644 --- a/service/iotthingsgraph/generated.json +++ b/service/iotthingsgraph/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/iotthingsgraph/go.mod b/service/iotthingsgraph/go.mod index e3c09c51b6a..b9756789139 100644 --- a/service/iotthingsgraph/go.mod +++ b/service/iotthingsgraph/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotthingsgraph/go.sum b/service/iotthingsgraph/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/iotthingsgraph/go.sum +++ b/service/iotthingsgraph/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/iottwinmaker/endpoints_test.go b/service/iottwinmaker/endpoints_test.go index ce463161358..41fe80cfe2b 100644 --- a/service/iottwinmaker/endpoints_test.go +++ b/service/iottwinmaker/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -725,14 +691,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -784,14 +748,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -843,14 +805,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -902,14 +862,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +900,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iottwinmaker/generated.json b/service/iottwinmaker/generated.json index 326a6827949..90faffb6bbd 100644 --- a/service/iottwinmaker/generated.json +++ b/service/iottwinmaker/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/iottwinmaker/go.mod b/service/iottwinmaker/go.mod index 7e72700c9d4..af1946331b5 100644 --- a/service/iottwinmaker/go.mod +++ b/service/iottwinmaker/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iottwinmaker/go.sum b/service/iottwinmaker/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/iottwinmaker/go.sum +++ b/service/iottwinmaker/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/iotwireless/endpoints_test.go b/service/iotwireless/endpoints_test.go index 305604586d0..e9f10f65f59 100644 --- a/service/iotwireless/endpoints_test.go +++ b/service/iotwireless/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -686,14 +654,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -745,14 +711,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -804,14 +768,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -863,14 +825,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -903,14 +863,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +900,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/iotwireless/generated.json b/service/iotwireless/generated.json index b84e1a2f688..7a4d8f6e02c 100644 --- a/service/iotwireless/generated.json +++ b/service/iotwireless/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/iotwireless/go.mod b/service/iotwireless/go.mod index 663592b7458..0c0692a6b0b 100644 --- a/service/iotwireless/go.mod +++ b/service/iotwireless/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotwireless/go.sum b/service/iotwireless/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/iotwireless/go.sum +++ b/service/iotwireless/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/ivs/endpoints_test.go b/service/ivs/endpoints_test.go index 2a93dc73b76..35ba6d78b0b 100644 --- a/service/ivs/endpoints_test.go +++ b/service/ivs/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -764,14 +728,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -823,14 +785,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -882,14 +842,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -941,14 +899,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1020,14 +974,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ivs/generated.json b/service/ivs/generated.json index cae441417d3..a58610f6139 100644 --- a/service/ivs/generated.json +++ b/service/ivs/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/ivs/go.mod b/service/ivs/go.mod index 1ef0cff19d0..54f1730b18b 100644 --- a/service/ivs/go.mod +++ b/service/ivs/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ivs/go.sum b/service/ivs/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/ivs/go.sum +++ b/service/ivs/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/ivschat/endpoints_test.go b/service/ivschat/endpoints_test.go index 90d8a810cf8..ecd0b9c1ad1 100644 --- a/service/ivschat/endpoints_test.go +++ b/service/ivschat/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -608,14 +580,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -667,14 +637,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -726,14 +694,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -785,14 +751,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -864,14 +826,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ivschat/generated.json b/service/ivschat/generated.json index 08a78ea3c49..198a3fec93d 100644 --- a/service/ivschat/generated.json +++ b/service/ivschat/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/ivschat/go.mod b/service/ivschat/go.mod index 6991c58468c..a32caa747a8 100644 --- a/service/ivschat/go.mod +++ b/service/ivschat/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ivschat/go.sum b/service/ivschat/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/ivschat/go.sum +++ b/service/ivschat/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/ivsrealtime/endpoints_test.go b/service/ivsrealtime/endpoints_test.go index 7c88dbaabbc..2b5a50f39f8 100644 --- a/service/ivsrealtime/endpoints_test.go +++ b/service/ivsrealtime/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ivsrealtime/generated.json b/service/ivsrealtime/generated.json index cc1910fdad8..1058fa52d5a 100644 --- a/service/ivsrealtime/generated.json +++ b/service/ivsrealtime/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/ivsrealtime/go.mod b/service/ivsrealtime/go.mod index fcca68217a3..1b4eb44f944 100644 --- a/service/ivsrealtime/go.mod +++ b/service/ivsrealtime/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ivsrealtime/go.sum b/service/ivsrealtime/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/ivsrealtime/go.sum +++ b/service/ivsrealtime/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/kafka/endpoints_test.go b/service/kafka/endpoints_test.go index 34978a4ecac..42c693eb9df 100644 --- a/service/kafka/endpoints_test.go +++ b/service/kafka/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1427,14 +1357,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1486,14 +1414,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1545,14 +1471,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1604,14 +1528,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/kafka/generated.json b/service/kafka/generated.json index 83abf8abed1..cc3d77ffa6f 100644 --- a/service/kafka/generated.json +++ b/service/kafka/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/kafka/go.mod b/service/kafka/go.mod index 349d338a780..9a16dc05042 100644 --- a/service/kafka/go.mod +++ b/service/kafka/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kafka/go.sum b/service/kafka/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/kafka/go.sum +++ b/service/kafka/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/kafkaconnect/endpoints_test.go b/service/kafkaconnect/endpoints_test.go index eb4b5634699..13ea42ee4ef 100644 --- a/service/kafkaconnect/endpoints_test.go +++ b/service/kafkaconnect/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1115,14 +1061,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1174,14 +1118,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1233,14 +1175,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1292,14 +1232,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/kafkaconnect/generated.json b/service/kafkaconnect/generated.json index 54de26b2c6e..596ca89af5a 100644 --- a/service/kafkaconnect/generated.json +++ b/service/kafkaconnect/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/kafkaconnect/go.mod b/service/kafkaconnect/go.mod index 76fbfd6536c..7214982abb1 100644 --- a/service/kafkaconnect/go.mod +++ b/service/kafkaconnect/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kafkaconnect/go.sum b/service/kafkaconnect/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/kafkaconnect/go.sum +++ b/service/kafkaconnect/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/kendra/endpoints_test.go b/service/kendra/endpoints_test.go index ccd82aaef7b..6880aa7fad2 100644 --- a/service/kendra/endpoints_test.go +++ b/service/kendra/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -920,14 +876,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -979,14 +933,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1038,14 +990,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1097,14 +1047,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/kendra/generated.json b/service/kendra/generated.json index 07e943c3c33..bc12a0f7eee 100644 --- a/service/kendra/generated.json +++ b/service/kendra/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/kendra/go.mod b/service/kendra/go.mod index 95bc8c74920..5a18fac5829 100644 --- a/service/kendra/go.mod +++ b/service/kendra/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kendra/go.sum b/service/kendra/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/kendra/go.sum +++ b/service/kendra/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/kendraranking/endpoints_test.go b/service/kendraranking/endpoints_test.go index c489f7fcad5..c949f18a7fb 100644 --- a/service/kendraranking/endpoints_test.go +++ b/service/kendraranking/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -41,14 +41,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -79,14 +77,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -117,14 +113,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -155,14 +149,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -193,14 +185,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -231,14 +221,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -270,14 +258,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -308,14 +294,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/kendraranking/generated.json b/service/kendraranking/generated.json index 18c2a177504..83e1001815d 100644 --- a/service/kendraranking/generated.json +++ b/service/kendraranking/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/kendraranking/go.mod b/service/kendraranking/go.mod index 06ca9605735..b81d7e0d719 100644 --- a/service/kendraranking/go.mod +++ b/service/kendraranking/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kendraranking/go.sum b/service/kendraranking/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/kendraranking/go.sum +++ b/service/kendraranking/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/keyspaces/endpoints_test.go b/service/keyspaces/endpoints_test.go index 380c05987a0..0111cf187a1 100644 --- a/service/keyspaces/endpoints_test.go +++ b/service/keyspaces/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1310,14 +1246,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1369,14 +1303,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1428,14 +1360,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1487,14 +1417,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1527,14 +1455,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/keyspaces/generated.json b/service/keyspaces/generated.json index 4980b846039..cee061283f8 100644 --- a/service/keyspaces/generated.json +++ b/service/keyspaces/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/keyspaces/go.mod b/service/keyspaces/go.mod index 72e0e5fb0d2..eeb0025675f 100644 --- a/service/keyspaces/go.mod +++ b/service/keyspaces/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/keyspaces/go.sum b/service/keyspaces/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/keyspaces/go.sum +++ b/service/keyspaces/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/kinesis/endpoints_test.go b/service/kinesis/endpoints_test.go index 2a093e3068e..92c2bbd339c 100644 --- a/service/kinesis/endpoints_test.go +++ b/service/kinesis/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2212,14 +2120,12 @@ func TestEndpointCase64(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2253,14 +2159,12 @@ func TestEndpointCase65(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2294,14 +2198,12 @@ func TestEndpointCase66(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2335,14 +2237,12 @@ func TestEndpointCase67(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2376,14 +2276,12 @@ func TestEndpointCase68(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2417,14 +2315,12 @@ func TestEndpointCase69(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2458,14 +2354,12 @@ func TestEndpointCase70(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2499,14 +2393,12 @@ func TestEndpointCase71(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2540,14 +2432,12 @@ func TestEndpointCase72(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2581,14 +2471,12 @@ func TestEndpointCase73(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2622,14 +2510,12 @@ func TestEndpointCase74(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2663,14 +2549,12 @@ func TestEndpointCase75(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2704,14 +2588,12 @@ func TestEndpointCase76(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2745,14 +2627,12 @@ func TestEndpointCase77(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2786,14 +2666,12 @@ func TestEndpointCase78(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2827,14 +2705,12 @@ func TestEndpointCase79(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3103,14 +2979,12 @@ func TestEndpointCase91(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3144,14 +3018,12 @@ func TestEndpointCase92(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3185,14 +3057,12 @@ func TestEndpointCase93(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3226,14 +3096,12 @@ func TestEndpointCase94(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3267,14 +3135,12 @@ func TestEndpointCase95(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3308,14 +3174,12 @@ func TestEndpointCase96(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3349,14 +3213,12 @@ func TestEndpointCase97(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3390,14 +3252,12 @@ func TestEndpointCase98(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3431,14 +3291,12 @@ func TestEndpointCase99(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3472,14 +3330,12 @@ func TestEndpointCase100(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3513,14 +3369,12 @@ func TestEndpointCase101(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3554,14 +3408,12 @@ func TestEndpointCase102(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3595,14 +3447,12 @@ func TestEndpointCase103(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3636,14 +3486,12 @@ func TestEndpointCase104(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3677,14 +3525,12 @@ func TestEndpointCase105(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3718,14 +3564,12 @@ func TestEndpointCase106(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3759,14 +3603,12 @@ func TestEndpointCase107(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3801,14 +3643,12 @@ func TestEndpointCase108(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4078,14 +3918,12 @@ func TestEndpointCase120(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4119,14 +3957,12 @@ func TestEndpointCase121(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4160,14 +3996,12 @@ func TestEndpointCase122(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4202,14 +4036,12 @@ func TestEndpointCase123(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4244,14 +4076,12 @@ func TestEndpointCase124(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4285,14 +4115,12 @@ func TestEndpointCase125(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4326,14 +4154,12 @@ func TestEndpointCase126(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4367,14 +4193,12 @@ func TestEndpointCase127(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4409,14 +4233,12 @@ func TestEndpointCase128(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4450,14 +4272,12 @@ func TestEndpointCase129(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4492,14 +4312,12 @@ func TestEndpointCase130(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4534,14 +4352,12 @@ func TestEndpointCase131(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4576,14 +4392,12 @@ func TestEndpointCase132(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4618,14 +4432,12 @@ func TestEndpointCase133(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4660,14 +4472,12 @@ func TestEndpointCase134(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4702,14 +4512,12 @@ func TestEndpointCase135(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4958,14 +4766,12 @@ func TestEndpointCase146(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5000,14 +4806,12 @@ func TestEndpointCase147(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5041,14 +4845,12 @@ func TestEndpointCase148(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5083,14 +4885,12 @@ func TestEndpointCase149(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5125,14 +4925,12 @@ func TestEndpointCase150(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5167,14 +4965,12 @@ func TestEndpointCase151(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5208,14 +5004,12 @@ func TestEndpointCase152(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5250,14 +5044,12 @@ func TestEndpointCase153(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5292,14 +5084,12 @@ func TestEndpointCase154(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5333,14 +5123,12 @@ func TestEndpointCase155(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5375,14 +5163,12 @@ func TestEndpointCase156(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5417,14 +5203,12 @@ func TestEndpointCase157(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5459,14 +5243,12 @@ func TestEndpointCase158(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5501,14 +5283,12 @@ func TestEndpointCase159(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5543,14 +5323,12 @@ func TestEndpointCase160(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5585,13 +5363,11 @@ func TestEndpointCase161(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/kinesis/generated.json b/service/kinesis/generated.json index 3afb650bae1..927a1c29d16 100644 --- a/service/kinesis/generated.json +++ b/service/kinesis/generated.json @@ -5,7 +5,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/kinesis/go.mod b/service/kinesis/go.mod index dbc1ba08212..6d7697c0d28 100644 --- a/service/kinesis/go.mod +++ b/service/kinesis/go.mod @@ -8,7 +8,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/kinesis/go.sum b/service/kinesis/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/kinesis/go.sum +++ b/service/kinesis/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/kinesisanalytics/endpoints_test.go b/service/kinesisanalytics/endpoints_test.go index 29cdef3ed6c..6521f8a3671 100644 --- a/service/kinesisanalytics/endpoints_test.go +++ b/service/kinesisanalytics/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1388,14 +1320,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1447,14 +1377,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1506,14 +1434,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1565,14 +1491,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1605,14 +1529,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/kinesisanalytics/generated.json b/service/kinesisanalytics/generated.json index d5c00a5f04a..66cfdb11cd8 100644 --- a/service/kinesisanalytics/generated.json +++ b/service/kinesisanalytics/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/kinesisanalytics/go.mod b/service/kinesisanalytics/go.mod index 837953ef664..a76df456bac 100644 --- a/service/kinesisanalytics/go.mod +++ b/service/kinesisanalytics/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisanalytics/go.sum b/service/kinesisanalytics/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/kinesisanalytics/go.sum +++ b/service/kinesisanalytics/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/kinesisanalyticsv2/endpoints_test.go b/service/kinesisanalyticsv2/endpoints_test.go index 22610df07f8..3bde59a4e05 100644 --- a/service/kinesisanalyticsv2/endpoints_test.go +++ b/service/kinesisanalyticsv2/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1388,14 +1320,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1447,14 +1377,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1506,14 +1434,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1565,14 +1491,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1605,14 +1529,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/kinesisanalyticsv2/generated.json b/service/kinesisanalyticsv2/generated.json index 2bbdac7b4f9..c18854072d5 100644 --- a/service/kinesisanalyticsv2/generated.json +++ b/service/kinesisanalyticsv2/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/kinesisanalyticsv2/go.mod b/service/kinesisanalyticsv2/go.mod index a46854146b5..c3d141b60cd 100644 --- a/service/kinesisanalyticsv2/go.mod +++ b/service/kinesisanalyticsv2/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisanalyticsv2/go.sum b/service/kinesisanalyticsv2/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/kinesisanalyticsv2/go.sum +++ b/service/kinesisanalyticsv2/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/kinesisvideo/endpoints_test.go b/service/kinesisvideo/endpoints_test.go index 8dd8490595c..54a9c834bee 100644 --- a/service/kinesisvideo/endpoints_test.go +++ b/service/kinesisvideo/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1115,14 +1061,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1174,14 +1118,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1233,14 +1175,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1292,14 +1232,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/kinesisvideo/generated.json b/service/kinesisvideo/generated.json index 66661511329..fafb0ad32b0 100644 --- a/service/kinesisvideo/generated.json +++ b/service/kinesisvideo/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/kinesisvideo/go.mod b/service/kinesisvideo/go.mod index 63c7f9f8365..c9abcebfcad 100644 --- a/service/kinesisvideo/go.mod +++ b/service/kinesisvideo/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisvideo/go.sum b/service/kinesisvideo/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/kinesisvideo/go.sum +++ b/service/kinesisvideo/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/kinesisvideoarchivedmedia/endpoints_test.go b/service/kinesisvideoarchivedmedia/endpoints_test.go index 281142fb074..3fdcdad33d6 100644 --- a/service/kinesisvideoarchivedmedia/endpoints_test.go +++ b/service/kinesisvideoarchivedmedia/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1115,14 +1061,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1174,14 +1118,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1233,14 +1175,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1292,14 +1232,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/kinesisvideoarchivedmedia/generated.json b/service/kinesisvideoarchivedmedia/generated.json index 5de5056fd8b..1272d6beec1 100644 --- a/service/kinesisvideoarchivedmedia/generated.json +++ b/service/kinesisvideoarchivedmedia/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/kinesisvideoarchivedmedia/go.mod b/service/kinesisvideoarchivedmedia/go.mod index e15328c5894..a2291cb7031 100644 --- a/service/kinesisvideoarchivedmedia/go.mod +++ b/service/kinesisvideoarchivedmedia/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisvideoarchivedmedia/go.sum b/service/kinesisvideoarchivedmedia/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/kinesisvideoarchivedmedia/go.sum +++ b/service/kinesisvideoarchivedmedia/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/kinesisvideomedia/endpoints_test.go b/service/kinesisvideomedia/endpoints_test.go index e12908b3c98..bcf37c449ae 100644 --- a/service/kinesisvideomedia/endpoints_test.go +++ b/service/kinesisvideomedia/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1115,14 +1061,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1174,14 +1118,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1233,14 +1175,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1292,14 +1232,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/kinesisvideomedia/generated.json b/service/kinesisvideomedia/generated.json index d93dd94aec6..5f8019722f7 100644 --- a/service/kinesisvideomedia/generated.json +++ b/service/kinesisvideomedia/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/kinesisvideomedia/go.mod b/service/kinesisvideomedia/go.mod index ac12cf2c245..d27bdb62363 100644 --- a/service/kinesisvideomedia/go.mod +++ b/service/kinesisvideomedia/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisvideomedia/go.sum b/service/kinesisvideomedia/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/kinesisvideomedia/go.sum +++ b/service/kinesisvideomedia/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/kinesisvideosignaling/endpoints_test.go b/service/kinesisvideosignaling/endpoints_test.go index 802a6671de9..45d964b4ba2 100644 --- a/service/kinesisvideosignaling/endpoints_test.go +++ b/service/kinesisvideosignaling/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1115,14 +1061,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1174,14 +1118,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1233,14 +1175,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1292,14 +1232,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/kinesisvideosignaling/generated.json b/service/kinesisvideosignaling/generated.json index db87cfc9a29..25db1b0b2d6 100644 --- a/service/kinesisvideosignaling/generated.json +++ b/service/kinesisvideosignaling/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/kinesisvideosignaling/go.mod b/service/kinesisvideosignaling/go.mod index a74891647ed..7f0d2c303f7 100644 --- a/service/kinesisvideosignaling/go.mod +++ b/service/kinesisvideosignaling/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisvideosignaling/go.sum b/service/kinesisvideosignaling/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/kinesisvideosignaling/go.sum +++ b/service/kinesisvideosignaling/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/kinesisvideowebrtcstorage/endpoints_test.go b/service/kinesisvideowebrtcstorage/endpoints_test.go index 3433355117b..3d4bd0866a2 100644 --- a/service/kinesisvideowebrtcstorage/endpoints_test.go +++ b/service/kinesisvideowebrtcstorage/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/kinesisvideowebrtcstorage/generated.json b/service/kinesisvideowebrtcstorage/generated.json index 0cbed3d9c50..b4b9b458d9d 100644 --- a/service/kinesisvideowebrtcstorage/generated.json +++ b/service/kinesisvideowebrtcstorage/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/kinesisvideowebrtcstorage/go.mod b/service/kinesisvideowebrtcstorage/go.mod index 87b1c8aed96..dc61d533907 100644 --- a/service/kinesisvideowebrtcstorage/go.mod +++ b/service/kinesisvideowebrtcstorage/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisvideowebrtcstorage/go.sum b/service/kinesisvideowebrtcstorage/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/kinesisvideowebrtcstorage/go.sum +++ b/service/kinesisvideowebrtcstorage/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/kms/endpoints_test.go b/service/kms/endpoints_test.go index be5aa593448..8b5a503b114 100644 --- a/service/kms/endpoints_test.go +++ b/service/kms/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1641,14 +1559,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1680,14 +1596,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1719,14 +1633,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1758,14 +1670,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1797,14 +1707,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1836,14 +1744,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1875,14 +1781,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1914,14 +1818,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1953,14 +1855,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1992,14 +1892,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2031,14 +1929,12 @@ func TestEndpointCase51(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2070,14 +1966,12 @@ func TestEndpointCase52(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2109,14 +2003,12 @@ func TestEndpointCase53(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2148,14 +2040,12 @@ func TestEndpointCase54(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2187,14 +2077,12 @@ func TestEndpointCase55(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2226,14 +2114,12 @@ func TestEndpointCase56(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2265,14 +2151,12 @@ func TestEndpointCase57(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2304,14 +2188,12 @@ func TestEndpointCase58(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2343,14 +2225,12 @@ func TestEndpointCase59(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2382,14 +2262,12 @@ func TestEndpointCase60(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2461,14 +2339,12 @@ func TestEndpointCase63(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2500,14 +2376,12 @@ func TestEndpointCase64(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2580,14 +2454,12 @@ func TestEndpointCase67(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2619,14 +2491,12 @@ func TestEndpointCase68(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/kms/generated.json b/service/kms/generated.json index eb4b1181bb6..0a713e7f403 100644 --- a/service/kms/generated.json +++ b/service/kms/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/kms/go.mod b/service/kms/go.mod index a32680c5a6b..f080915d2fd 100644 --- a/service/kms/go.mod +++ b/service/kms/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kms/go.sum b/service/kms/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/kms/go.sum +++ b/service/kms/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/lakeformation/endpoints_test.go b/service/lakeformation/endpoints_test.go index 9b328beab14..abc2fa1f81b 100644 --- a/service/lakeformation/endpoints_test.go +++ b/service/lakeformation/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1544,14 +1468,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1603,14 +1525,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1662,14 +1582,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1721,14 +1639,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1761,14 +1677,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/lakeformation/generated.json b/service/lakeformation/generated.json index 3e7714c9e96..64c7e9d49a5 100644 --- a/service/lakeformation/generated.json +++ b/service/lakeformation/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/lakeformation/go.mod b/service/lakeformation/go.mod index d9d73646657..a89f0896bbb 100644 --- a/service/lakeformation/go.mod +++ b/service/lakeformation/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lakeformation/go.sum b/service/lakeformation/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/lakeformation/go.sum +++ b/service/lakeformation/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/lambda/endpoints_test.go b/service/lambda/endpoints_test.go index 5ce13f81d19..a35c21bf80b 100644 --- a/service/lambda/endpoints_test.go +++ b/service/lambda/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1641,14 +1559,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1680,14 +1596,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1719,14 +1633,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1758,14 +1670,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1797,14 +1707,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1836,14 +1744,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1875,14 +1781,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1914,14 +1818,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1953,14 +1855,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1992,14 +1892,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2031,14 +1929,12 @@ func TestEndpointCase51(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2070,14 +1966,12 @@ func TestEndpointCase52(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2109,14 +2003,12 @@ func TestEndpointCase53(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2148,14 +2040,12 @@ func TestEndpointCase54(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2187,14 +2077,12 @@ func TestEndpointCase55(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2226,14 +2114,12 @@ func TestEndpointCase56(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2265,14 +2151,12 @@ func TestEndpointCase57(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2304,14 +2188,12 @@ func TestEndpointCase58(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2343,14 +2225,12 @@ func TestEndpointCase59(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2382,14 +2262,12 @@ func TestEndpointCase60(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2421,14 +2299,12 @@ func TestEndpointCase61(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2460,14 +2336,12 @@ func TestEndpointCase62(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2519,14 +2393,12 @@ func TestEndpointCase64(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2578,14 +2450,12 @@ func TestEndpointCase66(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2637,14 +2507,12 @@ func TestEndpointCase68(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2697,14 +2565,12 @@ func TestEndpointCase70(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2736,14 +2602,12 @@ func TestEndpointCase71(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/lambda/generated.json b/service/lambda/generated.json index 89090806184..8730d3a33d7 100644 --- a/service/lambda/generated.json +++ b/service/lambda/generated.json @@ -5,7 +5,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/lambda/go.mod b/service/lambda/go.mod index 2918afab44f..fd96adcb3f3 100644 --- a/service/lambda/go.mod +++ b/service/lambda/go.mod @@ -8,7 +8,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/lambda/go.sum b/service/lambda/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/lambda/go.sum +++ b/service/lambda/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/launchwizard/endpoints_test.go b/service/launchwizard/endpoints_test.go index 9225c875444..50e6f600628 100644 --- a/service/launchwizard/endpoints_test.go +++ b/service/launchwizard/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/launchwizard/generated.json b/service/launchwizard/generated.json index 816ff5abfce..96916b9eefc 100644 --- a/service/launchwizard/generated.json +++ b/service/launchwizard/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/launchwizard/go.mod b/service/launchwizard/go.mod index ceb827d67f4..418a5c26d91 100644 --- a/service/launchwizard/go.mod +++ b/service/launchwizard/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/launchwizard/go.sum b/service/launchwizard/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/launchwizard/go.sum +++ b/service/launchwizard/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/lexmodelbuildingservice/endpoints_test.go b/service/lexmodelbuildingservice/endpoints_test.go index 8bd11218011..3dd215121ca 100644 --- a/service/lexmodelbuildingservice/endpoints_test.go +++ b/service/lexmodelbuildingservice/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -920,14 +876,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -979,14 +933,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1038,14 +990,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1097,14 +1047,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/lexmodelbuildingservice/generated.json b/service/lexmodelbuildingservice/generated.json index d6ac963c63f..fd05ae1001f 100644 --- a/service/lexmodelbuildingservice/generated.json +++ b/service/lexmodelbuildingservice/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/lexmodelbuildingservice/go.mod b/service/lexmodelbuildingservice/go.mod index 1858b25797b..395c96fd996 100644 --- a/service/lexmodelbuildingservice/go.mod +++ b/service/lexmodelbuildingservice/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lexmodelbuildingservice/go.sum b/service/lexmodelbuildingservice/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/lexmodelbuildingservice/go.sum +++ b/service/lexmodelbuildingservice/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/lexmodelsv2/endpoints_test.go b/service/lexmodelsv2/endpoints_test.go index 1ed8bbb44ae..80105b40399 100644 --- a/service/lexmodelsv2/endpoints_test.go +++ b/service/lexmodelsv2/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -920,14 +876,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -979,14 +933,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1038,14 +990,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1097,14 +1047,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/lexmodelsv2/generated.json b/service/lexmodelsv2/generated.json index 5dce948772d..6f084d33c11 100644 --- a/service/lexmodelsv2/generated.json +++ b/service/lexmodelsv2/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/lexmodelsv2/go.mod b/service/lexmodelsv2/go.mod index de26c8ebe76..9c6c7c6203e 100644 --- a/service/lexmodelsv2/go.mod +++ b/service/lexmodelsv2/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/lexmodelsv2/go.sum b/service/lexmodelsv2/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/lexmodelsv2/go.sum +++ b/service/lexmodelsv2/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/lexruntimeservice/endpoints_test.go b/service/lexruntimeservice/endpoints_test.go index 079944c99fe..9c2d2ca1dc6 100644 --- a/service/lexruntimeservice/endpoints_test.go +++ b/service/lexruntimeservice/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -920,14 +876,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -979,14 +933,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1038,14 +990,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1097,14 +1047,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/lexruntimeservice/generated.json b/service/lexruntimeservice/generated.json index eadc938e91e..53f25171cf0 100644 --- a/service/lexruntimeservice/generated.json +++ b/service/lexruntimeservice/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/lexruntimeservice/go.mod b/service/lexruntimeservice/go.mod index f5d36f8997b..0fe1f9815a9 100644 --- a/service/lexruntimeservice/go.mod +++ b/service/lexruntimeservice/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lexruntimeservice/go.sum b/service/lexruntimeservice/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/lexruntimeservice/go.sum +++ b/service/lexruntimeservice/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/lexruntimev2/endpoints_test.go b/service/lexruntimev2/endpoints_test.go index 38c40342021..ac183756cff 100644 --- a/service/lexruntimev2/endpoints_test.go +++ b/service/lexruntimev2/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -920,14 +876,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -979,14 +933,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1038,14 +990,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1097,14 +1047,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/lexruntimev2/generated.json b/service/lexruntimev2/generated.json index 1b9ce2bd877..f25accf593f 100644 --- a/service/lexruntimev2/generated.json +++ b/service/lexruntimev2/generated.json @@ -4,8 +4,7 @@ "github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/lexruntimev2/go.mod b/service/lexruntimev2/go.mod index 6ad57ec1093..7bcf7bab9d4 100644 --- a/service/lexruntimev2/go.mod +++ b/service/lexruntimev2/go.mod @@ -8,7 +8,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lexruntimev2/go.sum b/service/lexruntimev2/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/lexruntimev2/go.sum +++ b/service/lexruntimev2/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/licensemanager/endpoints_test.go b/service/licensemanager/endpoints_test.go index 3beac70edd0..76d1289ca53 100644 --- a/service/licensemanager/endpoints_test.go +++ b/service/licensemanager/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1622,14 +1542,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1681,14 +1599,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1740,14 +1656,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/licensemanager/generated.json b/service/licensemanager/generated.json index 9b0bb21f76d..65201ff0474 100644 --- a/service/licensemanager/generated.json +++ b/service/licensemanager/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/licensemanager/go.mod b/service/licensemanager/go.mod index 0954cbaeb7e..6e467c92cb2 100644 --- a/service/licensemanager/go.mod +++ b/service/licensemanager/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/licensemanager/go.sum b/service/licensemanager/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/licensemanager/go.sum +++ b/service/licensemanager/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/licensemanagerlinuxsubscriptions/endpoints_test.go b/service/licensemanagerlinuxsubscriptions/endpoints_test.go index b6f2c127fa2..cb42236e312 100644 --- a/service/licensemanagerlinuxsubscriptions/endpoints_test.go +++ b/service/licensemanagerlinuxsubscriptions/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/licensemanagerlinuxsubscriptions/generated.json b/service/licensemanagerlinuxsubscriptions/generated.json index 7d5fd6c91a2..9f52acbcd1f 100644 --- a/service/licensemanagerlinuxsubscriptions/generated.json +++ b/service/licensemanagerlinuxsubscriptions/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/licensemanagerlinuxsubscriptions/go.mod b/service/licensemanagerlinuxsubscriptions/go.mod index 32c4577cac7..926b0425fd0 100644 --- a/service/licensemanagerlinuxsubscriptions/go.mod +++ b/service/licensemanagerlinuxsubscriptions/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/licensemanagerlinuxsubscriptions/go.sum b/service/licensemanagerlinuxsubscriptions/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/licensemanagerlinuxsubscriptions/go.sum +++ b/service/licensemanagerlinuxsubscriptions/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/licensemanagerusersubscriptions/endpoints_test.go b/service/licensemanagerusersubscriptions/endpoints_test.go index 0dd46c6b30c..d81013f72b6 100644 --- a/service/licensemanagerusersubscriptions/endpoints_test.go +++ b/service/licensemanagerusersubscriptions/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/licensemanagerusersubscriptions/generated.json b/service/licensemanagerusersubscriptions/generated.json index 1b2cb603cc9..b2ea6dae67e 100644 --- a/service/licensemanagerusersubscriptions/generated.json +++ b/service/licensemanagerusersubscriptions/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/licensemanagerusersubscriptions/go.mod b/service/licensemanagerusersubscriptions/go.mod index 464caf055c5..59f5ecd3184 100644 --- a/service/licensemanagerusersubscriptions/go.mod +++ b/service/licensemanagerusersubscriptions/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/licensemanagerusersubscriptions/go.sum b/service/licensemanagerusersubscriptions/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/licensemanagerusersubscriptions/go.sum +++ b/service/licensemanagerusersubscriptions/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/lightsail/endpoints_test.go b/service/lightsail/endpoints_test.go index be69fd54c11..bdbd6af30d0 100644 --- a/service/lightsail/endpoints_test.go +++ b/service/lightsail/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1037,14 +987,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1096,14 +1044,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1155,14 +1101,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1214,14 +1158,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1254,14 +1196,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1293,14 +1233,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/lightsail/generated.json b/service/lightsail/generated.json index edc04f2e46f..afd037afbb9 100644 --- a/service/lightsail/generated.json +++ b/service/lightsail/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/lightsail/go.mod b/service/lightsail/go.mod index 1f82ccd3efd..781359ec20d 100644 --- a/service/lightsail/go.mod +++ b/service/lightsail/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lightsail/go.sum b/service/lightsail/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/lightsail/go.sum +++ b/service/lightsail/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/location/endpoints_test.go b/service/location/endpoints_test.go index 42ea0de4933..7db70c22466 100644 --- a/service/location/endpoints_test.go +++ b/service/location/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/location/generated.json b/service/location/generated.json index 114eab90d4a..9968ec90723 100644 --- a/service/location/generated.json +++ b/service/location/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/location/go.mod b/service/location/go.mod index 16d546d0b68..740f51478fe 100644 --- a/service/location/go.mod +++ b/service/location/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/location/go.sum b/service/location/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/location/go.sum +++ b/service/location/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/lookoutequipment/endpoints_test.go b/service/lookoutequipment/endpoints_test.go index 180e5bd9d71..2c17f9e4263 100644 --- a/service/lookoutequipment/endpoints_test.go +++ b/service/lookoutequipment/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -608,14 +580,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -667,14 +637,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -726,14 +694,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -785,14 +751,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -864,14 +826,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/lookoutequipment/generated.json b/service/lookoutequipment/generated.json index 78f3b0d8b23..5cb5d979327 100644 --- a/service/lookoutequipment/generated.json +++ b/service/lookoutequipment/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/lookoutequipment/go.mod b/service/lookoutequipment/go.mod index e6c0b133ada..3ecc3aab0b8 100644 --- a/service/lookoutequipment/go.mod +++ b/service/lookoutequipment/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lookoutequipment/go.sum b/service/lookoutequipment/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/lookoutequipment/go.sum +++ b/service/lookoutequipment/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/lookoutmetrics/endpoints_test.go b/service/lookoutmetrics/endpoints_test.go index 0a620a73dca..ad13c9b0bfa 100644 --- a/service/lookoutmetrics/endpoints_test.go +++ b/service/lookoutmetrics/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -842,14 +802,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -901,14 +859,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -960,14 +916,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1019,14 +973,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1059,14 +1011,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1098,14 +1048,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/lookoutmetrics/generated.json b/service/lookoutmetrics/generated.json index 69acc0367f1..798689e20dd 100644 --- a/service/lookoutmetrics/generated.json +++ b/service/lookoutmetrics/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/lookoutmetrics/go.mod b/service/lookoutmetrics/go.mod index ae5a797386f..528d7ae2e9c 100644 --- a/service/lookoutmetrics/go.mod +++ b/service/lookoutmetrics/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lookoutmetrics/go.sum b/service/lookoutmetrics/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/lookoutmetrics/go.sum +++ b/service/lookoutmetrics/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/lookoutvision/endpoints_test.go b/service/lookoutvision/endpoints_test.go index 521c90c33a3..502360c78fb 100644 --- a/service/lookoutvision/endpoints_test.go +++ b/service/lookoutvision/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -764,14 +728,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -823,14 +785,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -882,14 +842,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -941,14 +899,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1020,14 +974,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/lookoutvision/generated.json b/service/lookoutvision/generated.json index 3e7e4be8a38..6327ca410f6 100644 --- a/service/lookoutvision/generated.json +++ b/service/lookoutvision/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/lookoutvision/go.mod b/service/lookoutvision/go.mod index bc5cffa3b6f..7c7658fc98c 100644 --- a/service/lookoutvision/go.mod +++ b/service/lookoutvision/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lookoutvision/go.sum b/service/lookoutvision/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/lookoutvision/go.sum +++ b/service/lookoutvision/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/m2/endpoints_test.go b/service/m2/endpoints_test.go index 06b131c2c84..670374350a3 100644 --- a/service/m2/endpoints_test.go +++ b/service/m2/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -764,14 +728,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -823,14 +785,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -882,14 +842,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -941,14 +899,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1020,14 +974,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/m2/generated.json b/service/m2/generated.json index b36e47f9169..aef42a6be30 100644 --- a/service/m2/generated.json +++ b/service/m2/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/m2/go.mod b/service/m2/go.mod index c1ec7a97892..a1535b019da 100644 --- a/service/m2/go.mod +++ b/service/m2/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/m2/go.sum b/service/m2/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/m2/go.sum +++ b/service/m2/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/machinelearning/endpoints_test.go b/service/machinelearning/endpoints_test.go index 446acf7dd2f..924c5e9a130 100644 --- a/service/machinelearning/endpoints_test.go +++ b/service/machinelearning/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -569,14 +543,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -628,14 +600,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -687,14 +657,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -746,14 +714,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/machinelearning/generated.json b/service/machinelearning/generated.json index e81bc2169e5..617c3286002 100644 --- a/service/machinelearning/generated.json +++ b/service/machinelearning/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/machinelearning/go.mod b/service/machinelearning/go.mod index b1d342950ea..467eb7c548d 100644 --- a/service/machinelearning/go.mod +++ b/service/machinelearning/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/machinelearning/go.sum b/service/machinelearning/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/machinelearning/go.sum +++ b/service/machinelearning/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/macie2/endpoints_test.go b/service/macie2/endpoints_test.go index 35b74a56cdc..50af5046049 100644 --- a/service/macie2/endpoints_test.go +++ b/service/macie2/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1427,14 +1357,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1486,14 +1414,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1545,14 +1471,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1604,14 +1528,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/macie2/generated.json b/service/macie2/generated.json index 7198aa6c0ad..96f5fc86638 100644 --- a/service/macie2/generated.json +++ b/service/macie2/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/macie2/go.mod b/service/macie2/go.mod index 84856583fcc..70de25cf3a0 100644 --- a/service/macie2/go.mod +++ b/service/macie2/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/macie2/go.sum b/service/macie2/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/macie2/go.sum +++ b/service/macie2/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/managedblockchain/endpoints_test.go b/service/managedblockchain/endpoints_test.go index ae8bd6f0239..bc7b4176a73 100644 --- a/service/managedblockchain/endpoints_test.go +++ b/service/managedblockchain/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -725,14 +691,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -784,14 +748,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -843,14 +805,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -902,14 +862,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +900,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/managedblockchain/generated.json b/service/managedblockchain/generated.json index 033c6180e18..744f08f62c4 100644 --- a/service/managedblockchain/generated.json +++ b/service/managedblockchain/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/managedblockchain/go.mod b/service/managedblockchain/go.mod index 2bed0892e44..c7eb8d726b4 100644 --- a/service/managedblockchain/go.mod +++ b/service/managedblockchain/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/managedblockchain/go.sum b/service/managedblockchain/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/managedblockchain/go.sum +++ b/service/managedblockchain/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/managedblockchainquery/endpoints_test.go b/service/managedblockchainquery/endpoints_test.go index 6dec51ace61..ea669936131 100644 --- a/service/managedblockchainquery/endpoints_test.go +++ b/service/managedblockchainquery/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/managedblockchainquery/generated.json b/service/managedblockchainquery/generated.json index 8f4783198e1..ff19d7a9246 100644 --- a/service/managedblockchainquery/generated.json +++ b/service/managedblockchainquery/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/managedblockchainquery/go.mod b/service/managedblockchainquery/go.mod index fa9e0e049ce..ae854c0b43a 100644 --- a/service/managedblockchainquery/go.mod +++ b/service/managedblockchainquery/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/managedblockchainquery/go.sum b/service/managedblockchainquery/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/managedblockchainquery/go.sum +++ b/service/managedblockchainquery/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/marketplaceagreement/endpoints_test.go b/service/marketplaceagreement/endpoints_test.go index 6b74b03038a..7a471816390 100644 --- a/service/marketplaceagreement/endpoints_test.go +++ b/service/marketplaceagreement/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/marketplaceagreement/generated.json b/service/marketplaceagreement/generated.json index 0c2b84bb240..35c7f219250 100644 --- a/service/marketplaceagreement/generated.json +++ b/service/marketplaceagreement/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/marketplaceagreement/go.mod b/service/marketplaceagreement/go.mod index af07e125876..3f7ac7ff053 100644 --- a/service/marketplaceagreement/go.mod +++ b/service/marketplaceagreement/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/marketplaceagreement/go.sum b/service/marketplaceagreement/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/marketplaceagreement/go.sum +++ b/service/marketplaceagreement/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/marketplacecatalog/endpoints_test.go b/service/marketplacecatalog/endpoints_test.go index 9b010d7fb2d..6803e42e832 100644 --- a/service/marketplacecatalog/endpoints_test.go +++ b/service/marketplacecatalog/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/marketplacecatalog/generated.json b/service/marketplacecatalog/generated.json index 234de701ed0..02ad3ba2d2a 100644 --- a/service/marketplacecatalog/generated.json +++ b/service/marketplacecatalog/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/marketplacecatalog/go.mod b/service/marketplacecatalog/go.mod index 50d757e8599..86e2722caa2 100644 --- a/service/marketplacecatalog/go.mod +++ b/service/marketplacecatalog/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/marketplacecatalog/go.sum b/service/marketplacecatalog/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/marketplacecatalog/go.sum +++ b/service/marketplacecatalog/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/marketplacecommerceanalytics/endpoints_test.go b/service/marketplacecommerceanalytics/endpoints_test.go index 17a5dd77115..e7a5c77405f 100644 --- a/service/marketplacecommerceanalytics/endpoints_test.go +++ b/service/marketplacecommerceanalytics/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/marketplacecommerceanalytics/generated.json b/service/marketplacecommerceanalytics/generated.json index 4af0190a5d3..16074c709f9 100644 --- a/service/marketplacecommerceanalytics/generated.json +++ b/service/marketplacecommerceanalytics/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/marketplacecommerceanalytics/go.mod b/service/marketplacecommerceanalytics/go.mod index 77d2e352ae2..d6b0b169a4e 100644 --- a/service/marketplacecommerceanalytics/go.mod +++ b/service/marketplacecommerceanalytics/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/marketplacecommerceanalytics/go.sum b/service/marketplacecommerceanalytics/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/marketplacecommerceanalytics/go.sum +++ b/service/marketplacecommerceanalytics/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/marketplacedeployment/endpoints_test.go b/service/marketplacedeployment/endpoints_test.go index a7a2ad79324..c5fd049666d 100644 --- a/service/marketplacedeployment/endpoints_test.go +++ b/service/marketplacedeployment/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/marketplacedeployment/generated.json b/service/marketplacedeployment/generated.json index 809c2aa383d..06532bcd70d 100644 --- a/service/marketplacedeployment/generated.json +++ b/service/marketplacedeployment/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/marketplacedeployment/go.mod b/service/marketplacedeployment/go.mod index 11a34d2e699..08fb983c09f 100644 --- a/service/marketplacedeployment/go.mod +++ b/service/marketplacedeployment/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/marketplacedeployment/go.sum b/service/marketplacedeployment/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/marketplacedeployment/go.sum +++ b/service/marketplacedeployment/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/marketplaceentitlementservice/endpoints_test.go b/service/marketplaceentitlementservice/endpoints_test.go index 4066e3784f3..271572c03a5 100644 --- a/service/marketplaceentitlementservice/endpoints_test.go +++ b/service/marketplaceentitlementservice/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/marketplaceentitlementservice/generated.json b/service/marketplaceentitlementservice/generated.json index 3cc1319b711..7fd1d8f452b 100644 --- a/service/marketplaceentitlementservice/generated.json +++ b/service/marketplaceentitlementservice/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/marketplaceentitlementservice/go.mod b/service/marketplaceentitlementservice/go.mod index 200f900d1ea..1ddc17e09b1 100644 --- a/service/marketplaceentitlementservice/go.mod +++ b/service/marketplaceentitlementservice/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/marketplaceentitlementservice/go.sum b/service/marketplaceentitlementservice/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/marketplaceentitlementservice/go.sum +++ b/service/marketplaceentitlementservice/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/marketplacemetering/endpoints_test.go b/service/marketplacemetering/endpoints_test.go index f01bae30dfb..152040328f5 100644 --- a/service/marketplacemetering/endpoints_test.go +++ b/service/marketplacemetering/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1388,14 +1320,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1447,14 +1377,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1506,14 +1434,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1565,14 +1491,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1605,14 +1529,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/marketplacemetering/generated.json b/service/marketplacemetering/generated.json index c2b2353cb2b..fba236e7d2f 100644 --- a/service/marketplacemetering/generated.json +++ b/service/marketplacemetering/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/marketplacemetering/go.mod b/service/marketplacemetering/go.mod index bd928c97c0c..1c17fe8762d 100644 --- a/service/marketplacemetering/go.mod +++ b/service/marketplacemetering/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/marketplacemetering/go.sum b/service/marketplacemetering/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/marketplacemetering/go.sum +++ b/service/marketplacemetering/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/mediaconnect/endpoints_test.go b/service/mediaconnect/endpoints_test.go index 8b205a27704..4074efe9777 100644 --- a/service/mediaconnect/endpoints_test.go +++ b/service/mediaconnect/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1115,14 +1061,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1174,14 +1118,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1233,14 +1175,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1292,14 +1232,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/mediaconnect/generated.json b/service/mediaconnect/generated.json index a39a902a0e4..4854719c1a2 100644 --- a/service/mediaconnect/generated.json +++ b/service/mediaconnect/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/mediaconnect/go.mod b/service/mediaconnect/go.mod index 8b17a4d8874..a4525ba1ef7 100644 --- a/service/mediaconnect/go.mod +++ b/service/mediaconnect/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/mediaconnect/go.sum b/service/mediaconnect/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/mediaconnect/go.sum +++ b/service/mediaconnect/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/mediaconvert/endpoints_test.go b/service/mediaconvert/endpoints_test.go index a50d01505d0..70db8e8ea65 100644 --- a/service/mediaconvert/endpoints_test.go +++ b/service/mediaconvert/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1388,14 +1320,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1447,14 +1377,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1506,14 +1434,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1565,14 +1491,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1605,14 +1529,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/mediaconvert/generated.json b/service/mediaconvert/generated.json index 0f0a6168c6f..a857d3c1f75 100644 --- a/service/mediaconvert/generated.json +++ b/service/mediaconvert/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/mediaconvert/go.mod b/service/mediaconvert/go.mod index 6d210a64d09..aaf774075f9 100644 --- a/service/mediaconvert/go.mod +++ b/service/mediaconvert/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediaconvert/go.sum b/service/mediaconvert/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/mediaconvert/go.sum +++ b/service/mediaconvert/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/medialive/endpoints_test.go b/service/medialive/endpoints_test.go index c7e7957af01..c925d944f25 100644 --- a/service/medialive/endpoints_test.go +++ b/service/medialive/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1154,14 +1098,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1233,14 +1175,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1292,14 +1232,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/medialive/generated.json b/service/medialive/generated.json index 40cc79d184d..44b827fa9bc 100644 --- a/service/medialive/generated.json +++ b/service/medialive/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/medialive/go.mod b/service/medialive/go.mod index c4c1a483aa6..4b0b11f2e7c 100644 --- a/service/medialive/go.mod +++ b/service/medialive/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/medialive/go.sum b/service/medialive/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/medialive/go.sum +++ b/service/medialive/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/mediapackage/endpoints_test.go b/service/mediapackage/endpoints_test.go index 071210853ac..e33b7fe7cdc 100644 --- a/service/mediapackage/endpoints_test.go +++ b/service/mediapackage/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1115,14 +1061,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1194,14 +1138,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1253,14 +1195,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1293,14 +1233,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/mediapackage/generated.json b/service/mediapackage/generated.json index 1d791e9149f..8bd76946c8b 100644 --- a/service/mediapackage/generated.json +++ b/service/mediapackage/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/mediapackage/go.mod b/service/mediapackage/go.mod index a2b59114324..24630fce47a 100644 --- a/service/mediapackage/go.mod +++ b/service/mediapackage/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediapackage/go.sum b/service/mediapackage/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/mediapackage/go.sum +++ b/service/mediapackage/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/mediapackagev2/endpoints_test.go b/service/mediapackagev2/endpoints_test.go index ccc94ff617d..8b3386b6753 100644 --- a/service/mediapackagev2/endpoints_test.go +++ b/service/mediapackagev2/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/mediapackagev2/generated.json b/service/mediapackagev2/generated.json index 27124c4d8e4..2024bbe68f9 100644 --- a/service/mediapackagev2/generated.json +++ b/service/mediapackagev2/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/mediapackagev2/go.mod b/service/mediapackagev2/go.mod index 58ee78959f5..5550609142d 100644 --- a/service/mediapackagev2/go.mod +++ b/service/mediapackagev2/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediapackagev2/go.sum b/service/mediapackagev2/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/mediapackagev2/go.sum +++ b/service/mediapackagev2/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/mediapackagevod/endpoints_test.go b/service/mediapackagevod/endpoints_test.go index 3168079c90e..a653fb955cc 100644 --- a/service/mediapackagevod/endpoints_test.go +++ b/service/mediapackagevod/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1076,14 +1024,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1135,14 +1081,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1194,14 +1138,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1253,14 +1195,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1293,14 +1233,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/mediapackagevod/generated.json b/service/mediapackagevod/generated.json index e82eb484509..357feeafe75 100644 --- a/service/mediapackagevod/generated.json +++ b/service/mediapackagevod/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/mediapackagevod/go.mod b/service/mediapackagevod/go.mod index f5d51c05386..0fe17221035 100644 --- a/service/mediapackagevod/go.mod +++ b/service/mediapackagevod/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediapackagevod/go.sum b/service/mediapackagevod/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/mediapackagevod/go.sum +++ b/service/mediapackagevod/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/mediastore/endpoints_test.go b/service/mediastore/endpoints_test.go index 61544c90bca..bffcfe5e507 100644 --- a/service/mediastore/endpoints_test.go +++ b/service/mediastore/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -842,14 +802,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -901,14 +859,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -960,14 +916,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1019,14 +973,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1059,14 +1011,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1098,14 +1048,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/mediastore/generated.json b/service/mediastore/generated.json index 43fc4b82a08..2f4ae4c5337 100644 --- a/service/mediastore/generated.json +++ b/service/mediastore/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/mediastore/go.mod b/service/mediastore/go.mod index dfb5c264f6c..7afb28249da 100644 --- a/service/mediastore/go.mod +++ b/service/mediastore/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediastore/go.sum b/service/mediastore/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/mediastore/go.sum +++ b/service/mediastore/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/mediastoredata/endpoints_test.go b/service/mediastoredata/endpoints_test.go index 7f5045c30ce..564d6ef3b81 100644 --- a/service/mediastoredata/endpoints_test.go +++ b/service/mediastoredata/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -842,14 +802,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -901,14 +859,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -960,14 +916,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1019,14 +973,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1059,14 +1011,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1098,14 +1048,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/mediastoredata/generated.json b/service/mediastoredata/generated.json index 45811f302e9..6a7e2d49229 100644 --- a/service/mediastoredata/generated.json +++ b/service/mediastoredata/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/mediastoredata/go.mod b/service/mediastoredata/go.mod index 4cc96f6d515..90f9a02d9ab 100644 --- a/service/mediastoredata/go.mod +++ b/service/mediastoredata/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediastoredata/go.sum b/service/mediastoredata/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/mediastoredata/go.sum +++ b/service/mediastoredata/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/mediatailor/endpoints_test.go b/service/mediatailor/endpoints_test.go index 974ad2b9aa8..df457612f2a 100644 --- a/service/mediatailor/endpoints_test.go +++ b/service/mediatailor/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -764,14 +728,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -823,14 +785,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -882,14 +842,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -941,14 +899,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1020,14 +974,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/mediatailor/generated.json b/service/mediatailor/generated.json index 94e3a9adad9..6dce90ee3cf 100644 --- a/service/mediatailor/generated.json +++ b/service/mediatailor/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/mediatailor/go.mod b/service/mediatailor/go.mod index 6a76e85c7bb..a366cd4af43 100644 --- a/service/mediatailor/go.mod +++ b/service/mediatailor/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediatailor/go.sum b/service/mediatailor/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/mediatailor/go.sum +++ b/service/mediatailor/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/medicalimaging/endpoints_test.go b/service/medicalimaging/endpoints_test.go index 3cb2580261f..f51a20e5a3b 100644 --- a/service/medicalimaging/endpoints_test.go +++ b/service/medicalimaging/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/medicalimaging/generated.json b/service/medicalimaging/generated.json index d2886b7fed5..c2220752ed1 100644 --- a/service/medicalimaging/generated.json +++ b/service/medicalimaging/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/medicalimaging/go.mod b/service/medicalimaging/go.mod index 61a9c22ee26..dd5e6ecc4ab 100644 --- a/service/medicalimaging/go.mod +++ b/service/medicalimaging/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/medicalimaging/go.sum b/service/medicalimaging/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/medicalimaging/go.sum +++ b/service/medicalimaging/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/memorydb/endpoints_test.go b/service/memorydb/endpoints_test.go index 9a76b51f90a..477b6a99b06 100644 --- a/service/memorydb/endpoints_test.go +++ b/service/memorydb/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -44,14 +44,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -83,14 +81,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -122,14 +118,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -161,14 +155,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -200,14 +192,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -239,14 +229,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -278,14 +266,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -317,14 +303,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -356,14 +340,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -395,14 +377,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -434,14 +414,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -489,14 +467,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -528,14 +504,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -567,14 +541,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -606,14 +578,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -645,14 +615,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -684,14 +652,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -723,14 +689,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -762,14 +726,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -801,14 +763,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -840,14 +800,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -879,14 +837,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -918,14 +874,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -957,14 +911,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -996,14 +948,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1035,14 +985,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1074,14 +1022,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1113,14 +1059,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1152,14 +1096,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1211,14 +1153,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1270,14 +1210,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1267,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1388,14 +1324,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1428,14 +1362,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1467,14 +1399,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/memorydb/generated.json b/service/memorydb/generated.json index 157f4ddc4ff..e0a2d41df7c 100644 --- a/service/memorydb/generated.json +++ b/service/memorydb/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/memorydb/go.mod b/service/memorydb/go.mod index 0a28edb0ea1..d8671455c50 100644 --- a/service/memorydb/go.mod +++ b/service/memorydb/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/memorydb/go.sum b/service/memorydb/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/memorydb/go.sum +++ b/service/memorydb/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/mgn/endpoints_test.go b/service/mgn/endpoints_test.go index 5515b7285dc..11b2290e709 100644 --- a/service/mgn/endpoints_test.go +++ b/service/mgn/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1310,14 +1246,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1369,14 +1303,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1428,14 +1360,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1487,14 +1417,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1527,14 +1455,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/mgn/generated.json b/service/mgn/generated.json index 84136f8fd76..f62265d850a 100644 --- a/service/mgn/generated.json +++ b/service/mgn/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/mgn/go.mod b/service/mgn/go.mod index 8f1c6f8697d..1ea0a7ff3e0 100644 --- a/service/mgn/go.mod +++ b/service/mgn/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mgn/go.sum b/service/mgn/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/mgn/go.sum +++ b/service/mgn/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/migrationhub/endpoints_test.go b/service/migrationhub/endpoints_test.go index 66402b1d9c2..9856163abfe 100644 --- a/service/migrationhub/endpoints_test.go +++ b/service/migrationhub/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -764,14 +728,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -823,14 +785,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -882,14 +842,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -941,14 +899,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1020,14 +974,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/migrationhub/generated.json b/service/migrationhub/generated.json index 0112cac11b6..cd11390ea2a 100644 --- a/service/migrationhub/generated.json +++ b/service/migrationhub/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/migrationhub/go.mod b/service/migrationhub/go.mod index 2f0cb7a8e8c..f4cdb4c350e 100644 --- a/service/migrationhub/go.mod +++ b/service/migrationhub/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/migrationhub/go.sum b/service/migrationhub/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/migrationhub/go.sum +++ b/service/migrationhub/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/migrationhubconfig/endpoints_test.go b/service/migrationhubconfig/endpoints_test.go index d03d9335069..69d414011f6 100644 --- a/service/migrationhubconfig/endpoints_test.go +++ b/service/migrationhubconfig/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/migrationhubconfig/generated.json b/service/migrationhubconfig/generated.json index 2dbccef51cc..73c7eb9423d 100644 --- a/service/migrationhubconfig/generated.json +++ b/service/migrationhubconfig/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/migrationhubconfig/go.mod b/service/migrationhubconfig/go.mod index 1d24342e806..be276dd9d65 100644 --- a/service/migrationhubconfig/go.mod +++ b/service/migrationhubconfig/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/migrationhubconfig/go.sum b/service/migrationhubconfig/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/migrationhubconfig/go.sum +++ b/service/migrationhubconfig/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/migrationhuborchestrator/endpoints_test.go b/service/migrationhuborchestrator/endpoints_test.go index 0eab88be8e8..f2878006d05 100644 --- a/service/migrationhuborchestrator/endpoints_test.go +++ b/service/migrationhuborchestrator/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/migrationhuborchestrator/generated.json b/service/migrationhuborchestrator/generated.json index 7a3299ee607..d15fecb6ddc 100644 --- a/service/migrationhuborchestrator/generated.json +++ b/service/migrationhuborchestrator/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/migrationhuborchestrator/go.mod b/service/migrationhuborchestrator/go.mod index 5d7cbd61130..7317df3ee94 100644 --- a/service/migrationhuborchestrator/go.mod +++ b/service/migrationhuborchestrator/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/migrationhuborchestrator/go.sum b/service/migrationhuborchestrator/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/migrationhuborchestrator/go.sum +++ b/service/migrationhuborchestrator/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/migrationhubrefactorspaces/endpoints_test.go b/service/migrationhubrefactorspaces/endpoints_test.go index c0260b7bae0..e8e0f36ee9a 100644 --- a/service/migrationhubrefactorspaces/endpoints_test.go +++ b/service/migrationhubrefactorspaces/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/migrationhubrefactorspaces/generated.json b/service/migrationhubrefactorspaces/generated.json index 5c494b7ed40..a86848c5e5b 100644 --- a/service/migrationhubrefactorspaces/generated.json +++ b/service/migrationhubrefactorspaces/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/migrationhubrefactorspaces/go.mod b/service/migrationhubrefactorspaces/go.mod index 9ddb7795405..fb5ae44da42 100644 --- a/service/migrationhubrefactorspaces/go.mod +++ b/service/migrationhubrefactorspaces/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/migrationhubrefactorspaces/go.sum b/service/migrationhubrefactorspaces/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/migrationhubrefactorspaces/go.sum +++ b/service/migrationhubrefactorspaces/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/migrationhubstrategy/endpoints_test.go b/service/migrationhubstrategy/endpoints_test.go index 1147b02a659..d9646286298 100644 --- a/service/migrationhubstrategy/endpoints_test.go +++ b/service/migrationhubstrategy/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -764,14 +728,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -823,14 +785,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -882,14 +842,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -941,14 +899,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1020,14 +974,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/migrationhubstrategy/generated.json b/service/migrationhubstrategy/generated.json index e56a70130fe..d8e54a23756 100644 --- a/service/migrationhubstrategy/generated.json +++ b/service/migrationhubstrategy/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/migrationhubstrategy/go.mod b/service/migrationhubstrategy/go.mod index e888972d032..f16d07e2b17 100644 --- a/service/migrationhubstrategy/go.mod +++ b/service/migrationhubstrategy/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/migrationhubstrategy/go.sum b/service/migrationhubstrategy/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/migrationhubstrategy/go.sum +++ b/service/migrationhubstrategy/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/mobile/endpoints_test.go b/service/mobile/endpoints_test.go index bd8706e1def..c04431f470b 100644 --- a/service/mobile/endpoints_test.go +++ b/service/mobile/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/mobile/generated.json b/service/mobile/generated.json index b36bbd13969..702e390a34b 100644 --- a/service/mobile/generated.json +++ b/service/mobile/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/mobile/go.mod b/service/mobile/go.mod index c78dc045998..0d1bc1136d4 100644 --- a/service/mobile/go.mod +++ b/service/mobile/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mobile/go.sum b/service/mobile/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/mobile/go.sum +++ b/service/mobile/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/mq/endpoints_test.go b/service/mq/endpoints_test.go index ea8409ddedc..cf0bcbdbe35 100644 --- a/service/mq/endpoints_test.go +++ b/service/mq/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1642,14 +1562,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1701,14 +1619,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1760,14 +1676,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/mq/generated.json b/service/mq/generated.json index 539ad46ee1f..2966c710771 100644 --- a/service/mq/generated.json +++ b/service/mq/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/mq/go.mod b/service/mq/go.mod index 872a8245700..2467dac377d 100644 --- a/service/mq/go.mod +++ b/service/mq/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mq/go.sum b/service/mq/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/mq/go.sum +++ b/service/mq/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/mturk/endpoints_test.go b/service/mturk/endpoints_test.go index 87e6b83c432..1c4937ac701 100644 --- a/service/mturk/endpoints_test.go +++ b/service/mturk/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -569,14 +543,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -628,14 +600,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -687,14 +657,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -746,14 +714,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/mturk/generated.json b/service/mturk/generated.json index 875c024f186..68bca39d8a1 100644 --- a/service/mturk/generated.json +++ b/service/mturk/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/mturk/go.mod b/service/mturk/go.mod index 1cc22ceb70c..bdbea56ae62 100644 --- a/service/mturk/go.mod +++ b/service/mturk/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mturk/go.sum b/service/mturk/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/mturk/go.sum +++ b/service/mturk/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/mwaa/endpoints_test.go b/service/mwaa/endpoints_test.go index a39295541a5..a2c1e3663d3 100644 --- a/service/mwaa/endpoints_test.go +++ b/service/mwaa/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1076,14 +1024,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1135,14 +1081,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1194,14 +1138,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1253,14 +1195,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1293,14 +1233,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/mwaa/generated.json b/service/mwaa/generated.json index aa5d0cb999d..c676b5453d4 100644 --- a/service/mwaa/generated.json +++ b/service/mwaa/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/mwaa/go.mod b/service/mwaa/go.mod index f92bde5ae4d..74ae3122349 100644 --- a/service/mwaa/go.mod +++ b/service/mwaa/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mwaa/go.sum b/service/mwaa/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/mwaa/go.sum +++ b/service/mwaa/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/neptune/endpoints_test.go b/service/neptune/endpoints_test.go index 50aa57d6151..cd6787c644b 100644 --- a/service/neptune/endpoints_test.go +++ b/service/neptune/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1641,14 +1559,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1700,14 +1616,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1759,14 +1673,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1818,14 +1730,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1917,14 +1825,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/neptune/generated.json b/service/neptune/generated.json index f64b9a13675..a7f3f804a46 100644 --- a/service/neptune/generated.json +++ b/service/neptune/generated.json @@ -6,7 +6,6 @@ "github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding": "v1.0.5", "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url": "v1.0.7", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/neptune/go.mod b/service/neptune/go.mod index 06f7273059d..91a5ecaa316 100644 --- a/service/neptune/go.mod +++ b/service/neptune/go.mod @@ -9,7 +9,6 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.4 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/neptune/go.sum b/service/neptune/go.sum index 373314e89bc..2230ad62888 100644 --- a/service/neptune/go.sum +++ b/service/neptune/go.sum @@ -3,7 +3,6 @@ github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/neptunedata/endpoints_test.go b/service/neptunedata/endpoints_test.go index 2f7e3ff82e2..ee05cd76c27 100644 --- a/service/neptunedata/endpoints_test.go +++ b/service/neptunedata/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/neptunedata/generated.json b/service/neptunedata/generated.json index 94dbcf01a77..db059a81b54 100644 --- a/service/neptunedata/generated.json +++ b/service/neptunedata/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/neptunedata/go.mod b/service/neptunedata/go.mod index 405bcfd8e32..1b1a3741b7b 100644 --- a/service/neptunedata/go.mod +++ b/service/neptunedata/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/neptunedata/go.sum b/service/neptunedata/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/neptunedata/go.sum +++ b/service/neptunedata/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/neptunegraph/endpoints_test.go b/service/neptunegraph/endpoints_test.go index 2b58372b07b..aa293f5edfa 100644 --- a/service/neptunegraph/endpoints_test.go +++ b/service/neptunegraph/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -158,14 +152,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -199,14 +191,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -262,14 +252,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -325,14 +313,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -366,14 +352,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -407,14 +391,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -448,14 +430,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -489,14 +469,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -552,14 +530,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -615,14 +591,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -656,14 +630,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -697,14 +669,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -738,14 +708,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -779,14 +747,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -842,14 +808,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -905,14 +869,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -946,14 +908,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -987,14 +947,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1028,14 +986,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1069,14 +1025,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1132,14 +1086,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1195,14 +1147,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1236,14 +1186,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1277,14 +1225,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1318,14 +1264,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1359,14 +1303,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1422,14 +1364,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1425,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1526,14 +1464,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1567,14 +1503,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1608,14 +1542,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1649,14 +1581,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1712,14 +1642,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1775,14 +1703,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1816,14 +1742,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1857,14 +1781,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1898,14 +1820,12 @@ func TestEndpointCase51(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1939,14 +1859,12 @@ func TestEndpointCase52(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2002,14 +1920,12 @@ func TestEndpointCase54(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2065,14 +1981,12 @@ func TestEndpointCase56(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2106,14 +2020,12 @@ func TestEndpointCase57(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2147,14 +2059,12 @@ func TestEndpointCase58(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2188,14 +2098,12 @@ func TestEndpointCase59(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2229,14 +2137,12 @@ func TestEndpointCase60(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2292,14 +2198,12 @@ func TestEndpointCase62(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2355,14 +2259,12 @@ func TestEndpointCase64(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2396,14 +2298,12 @@ func TestEndpointCase65(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2437,14 +2337,12 @@ func TestEndpointCase66(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2478,14 +2376,12 @@ func TestEndpointCase67(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/neptunegraph/generated.json b/service/neptunegraph/generated.json index fb57e0039e5..e95216c7b14 100644 --- a/service/neptunegraph/generated.json +++ b/service/neptunegraph/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/neptunegraph/go.mod b/service/neptunegraph/go.mod index 41ae78193bc..31903826ded 100644 --- a/service/neptunegraph/go.mod +++ b/service/neptunegraph/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/neptunegraph/go.sum b/service/neptunegraph/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/neptunegraph/go.sum +++ b/service/neptunegraph/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/networkfirewall/endpoints_test.go b/service/networkfirewall/endpoints_test.go index e3b2d8697a0..dbdceee0231 100644 --- a/service/networkfirewall/endpoints_test.go +++ b/service/networkfirewall/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1544,14 +1468,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1603,14 +1525,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1662,14 +1582,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1721,14 +1639,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1761,14 +1677,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/networkfirewall/generated.json b/service/networkfirewall/generated.json index adb335703db..c0156758864 100644 --- a/service/networkfirewall/generated.json +++ b/service/networkfirewall/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/networkfirewall/go.mod b/service/networkfirewall/go.mod index b4eb1358bbf..702779bb1cb 100644 --- a/service/networkfirewall/go.mod +++ b/service/networkfirewall/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/networkfirewall/go.sum b/service/networkfirewall/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/networkfirewall/go.sum +++ b/service/networkfirewall/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/networkmanager/endpoints_test.go b/service/networkmanager/endpoints_test.go index d5ab4695ff3..d01bcd24192 100644 --- a/service/networkmanager/endpoints_test.go +++ b/service/networkmanager/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -60,14 +60,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -99,14 +97,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -138,14 +134,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -177,14 +171,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -232,14 +224,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -271,14 +261,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -310,14 +298,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -349,14 +335,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -388,14 +372,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -443,14 +425,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -482,14 +462,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -521,14 +499,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -560,14 +536,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -615,14 +589,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -674,14 +646,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -733,14 +703,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -792,14 +760,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -851,14 +817,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -891,14 +855,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -930,14 +892,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/networkmanager/generated.json b/service/networkmanager/generated.json index 142f7dfba4f..3031becc635 100644 --- a/service/networkmanager/generated.json +++ b/service/networkmanager/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/networkmanager/go.mod b/service/networkmanager/go.mod index 19ef5ba1939..faa9fc41290 100644 --- a/service/networkmanager/go.mod +++ b/service/networkmanager/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/networkmanager/go.sum b/service/networkmanager/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/networkmanager/go.sum +++ b/service/networkmanager/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/networkmonitor/endpoints_test.go b/service/networkmonitor/endpoints_test.go index 81ca9cc3fb3..7d9503ff736 100644 --- a/service/networkmonitor/endpoints_test.go +++ b/service/networkmonitor/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/networkmonitor/generated.json b/service/networkmonitor/generated.json index a2919145224..4d35222f112 100644 --- a/service/networkmonitor/generated.json +++ b/service/networkmonitor/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/networkmonitor/go.mod b/service/networkmonitor/go.mod index 58d6c610d6c..c1d59dc0ba6 100644 --- a/service/networkmonitor/go.mod +++ b/service/networkmonitor/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/networkmonitor/go.sum b/service/networkmonitor/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/networkmonitor/go.sum +++ b/service/networkmonitor/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/nimble/endpoints_test.go b/service/nimble/endpoints_test.go index 35aa117d63e..f3adbce379d 100644 --- a/service/nimble/endpoints_test.go +++ b/service/nimble/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -725,14 +691,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -784,14 +748,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -843,14 +805,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -902,14 +862,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +900,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/nimble/generated.json b/service/nimble/generated.json index e214e5674cc..19f26d73d23 100644 --- a/service/nimble/generated.json +++ b/service/nimble/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/nimble/go.mod b/service/nimble/go.mod index 31684f2b29f..8b5b69bd174 100644 --- a/service/nimble/go.mod +++ b/service/nimble/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/nimble/go.sum b/service/nimble/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/nimble/go.sum +++ b/service/nimble/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/oam/endpoints_test.go b/service/oam/endpoints_test.go index f227254bee3..cba66524496 100644 --- a/service/oam/endpoints_test.go +++ b/service/oam/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/oam/generated.json b/service/oam/generated.json index 02668286409..db3812f7e9e 100644 --- a/service/oam/generated.json +++ b/service/oam/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/oam/go.mod b/service/oam/go.mod index 23fb60d5cb6..318fb444db8 100644 --- a/service/oam/go.mod +++ b/service/oam/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/oam/go.sum b/service/oam/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/oam/go.sum +++ b/service/oam/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/omics/endpoints_test.go b/service/omics/endpoints_test.go index fa8511e36ca..692eaecee5f 100644 --- a/service/omics/endpoints_test.go +++ b/service/omics/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/omics/generated.json b/service/omics/generated.json index 2d11be18bae..2b06bb2d046 100644 --- a/service/omics/generated.json +++ b/service/omics/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/omics/go.mod b/service/omics/go.mod index f6769a20589..ff3c79e70a1 100644 --- a/service/omics/go.mod +++ b/service/omics/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/omics/go.sum b/service/omics/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/omics/go.sum +++ b/service/omics/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/opensearch/endpoints_test.go b/service/opensearch/endpoints_test.go index 096bf5f9a25..671c13bacc7 100644 --- a/service/opensearch/endpoints_test.go +++ b/service/opensearch/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/opensearch/generated.json b/service/opensearch/generated.json index 94c1a0645e3..84faaddfce8 100644 --- a/service/opensearch/generated.json +++ b/service/opensearch/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/opensearch/go.mod b/service/opensearch/go.mod index abeaadbcb24..1624a69dfe8 100644 --- a/service/opensearch/go.mod +++ b/service/opensearch/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/opensearch/go.sum b/service/opensearch/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/opensearch/go.sum +++ b/service/opensearch/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/opensearchserverless/endpoints_test.go b/service/opensearchserverless/endpoints_test.go index f12a94c7879..99d7e0ccc98 100644 --- a/service/opensearchserverless/endpoints_test.go +++ b/service/opensearchserverless/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/opensearchserverless/generated.json b/service/opensearchserverless/generated.json index a62dcbf7665..23401168cf7 100644 --- a/service/opensearchserverless/generated.json +++ b/service/opensearchserverless/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/opensearchserverless/go.mod b/service/opensearchserverless/go.mod index e8b8656f309..dab0422b7de 100644 --- a/service/opensearchserverless/go.mod +++ b/service/opensearchserverless/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/opensearchserverless/go.sum b/service/opensearchserverless/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/opensearchserverless/go.sum +++ b/service/opensearchserverless/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/opsworks/endpoints_test.go b/service/opsworks/endpoints_test.go index 283c857525d..cb1bc96ddf8 100644 --- a/service/opsworks/endpoints_test.go +++ b/service/opsworks/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1076,14 +1024,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1135,14 +1081,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1194,14 +1138,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1253,14 +1195,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1293,14 +1233,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/opsworks/generated.json b/service/opsworks/generated.json index bc400f5534f..3792ad14f5a 100644 --- a/service/opsworks/generated.json +++ b/service/opsworks/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/opsworks/go.mod b/service/opsworks/go.mod index 218c8948ef8..9eaaea5364d 100644 --- a/service/opsworks/go.mod +++ b/service/opsworks/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/opsworks/go.sum b/service/opsworks/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/opsworks/go.sum +++ b/service/opsworks/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/opsworkscm/endpoints_test.go b/service/opsworkscm/endpoints_test.go index 9caab4d8f1a..8e7d8284de8 100644 --- a/service/opsworkscm/endpoints_test.go +++ b/service/opsworkscm/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -842,14 +802,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -901,14 +859,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -960,14 +916,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1019,14 +973,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1059,14 +1011,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1098,14 +1048,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/opsworkscm/generated.json b/service/opsworkscm/generated.json index 825d45d11eb..72b569e5c74 100644 --- a/service/opsworkscm/generated.json +++ b/service/opsworkscm/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/opsworkscm/go.mod b/service/opsworkscm/go.mod index 88a3e975db8..d5b078183ae 100644 --- a/service/opsworkscm/go.mod +++ b/service/opsworkscm/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/opsworkscm/go.sum b/service/opsworkscm/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/opsworkscm/go.sum +++ b/service/opsworkscm/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/organizations/endpoints_test.go b/service/organizations/endpoints_test.go index da3d9377118..f01adfe1e35 100644 --- a/service/organizations/endpoints_test.go +++ b/service/organizations/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -60,14 +60,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -115,14 +113,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -154,14 +150,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -209,14 +203,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -248,14 +240,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -303,14 +293,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -358,14 +346,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -397,14 +383,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -436,14 +420,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -475,14 +457,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +510,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -585,14 +563,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -640,14 +616,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -679,14 +653,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -734,14 +706,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -773,14 +743,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -828,14 +796,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -883,14 +849,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +906,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +979,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1076,14 +1036,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1135,14 +1093,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1175,14 +1131,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1214,14 +1168,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/organizations/generated.json b/service/organizations/generated.json index c0c4201bbac..6f979661528 100644 --- a/service/organizations/generated.json +++ b/service/organizations/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/organizations/go.mod b/service/organizations/go.mod index 7d089205e01..88d047d83c0 100644 --- a/service/organizations/go.mod +++ b/service/organizations/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/organizations/go.sum b/service/organizations/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/organizations/go.sum +++ b/service/organizations/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/osis/endpoints_test.go b/service/osis/endpoints_test.go index 7a2fecd3f59..2ca40f14c9b 100644 --- a/service/osis/endpoints_test.go +++ b/service/osis/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/osis/generated.json b/service/osis/generated.json index b5d65d05700..43f28937ad6 100644 --- a/service/osis/generated.json +++ b/service/osis/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/osis/go.mod b/service/osis/go.mod index bf7cd701384..5f64a7be0bf 100644 --- a/service/osis/go.mod +++ b/service/osis/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/osis/go.sum b/service/osis/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/osis/go.sum +++ b/service/osis/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/outposts/endpoints_test.go b/service/outposts/endpoints_test.go index a92c7fa87b4..dd6c493f8c1 100644 --- a/service/outposts/endpoints_test.go +++ b/service/outposts/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1662,14 +1582,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1721,14 +1639,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1761,14 +1677,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/outposts/generated.json b/service/outposts/generated.json index d4edbc81fbd..420311c017e 100644 --- a/service/outposts/generated.json +++ b/service/outposts/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/outposts/go.mod b/service/outposts/go.mod index 3c6f7f7e19e..69786990f6a 100644 --- a/service/outposts/go.mod +++ b/service/outposts/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/outposts/go.sum b/service/outposts/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/outposts/go.sum +++ b/service/outposts/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/panorama/endpoints_test.go b/service/panorama/endpoints_test.go index 2b66c883553..5218a0dc627 100644 --- a/service/panorama/endpoints_test.go +++ b/service/panorama/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/panorama/generated.json b/service/panorama/generated.json index dedbe192c2b..052437e1b71 100644 --- a/service/panorama/generated.json +++ b/service/panorama/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/panorama/go.mod b/service/panorama/go.mod index 0ace3272063..b48cd078b56 100644 --- a/service/panorama/go.mod +++ b/service/panorama/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/panorama/go.sum b/service/panorama/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/panorama/go.sum +++ b/service/panorama/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/paymentcryptography/endpoints_test.go b/service/paymentcryptography/endpoints_test.go index 57ad2c619b9..13ba1805c95 100644 --- a/service/paymentcryptography/endpoints_test.go +++ b/service/paymentcryptography/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/paymentcryptography/generated.json b/service/paymentcryptography/generated.json index ffa90222faf..2fffa2655fe 100644 --- a/service/paymentcryptography/generated.json +++ b/service/paymentcryptography/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/paymentcryptography/go.mod b/service/paymentcryptography/go.mod index bf5c009e608..9dec16d11e9 100644 --- a/service/paymentcryptography/go.mod +++ b/service/paymentcryptography/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/paymentcryptography/go.sum b/service/paymentcryptography/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/paymentcryptography/go.sum +++ b/service/paymentcryptography/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/paymentcryptographydata/endpoints_test.go b/service/paymentcryptographydata/endpoints_test.go index ad2f28cd2e2..028b1d8e1c5 100644 --- a/service/paymentcryptographydata/endpoints_test.go +++ b/service/paymentcryptographydata/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/paymentcryptographydata/generated.json b/service/paymentcryptographydata/generated.json index d76f0664785..10f1a716727 100644 --- a/service/paymentcryptographydata/generated.json +++ b/service/paymentcryptographydata/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/paymentcryptographydata/go.mod b/service/paymentcryptographydata/go.mod index 44124b03b2b..0f4ce49c94f 100644 --- a/service/paymentcryptographydata/go.mod +++ b/service/paymentcryptographydata/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/paymentcryptographydata/go.sum b/service/paymentcryptographydata/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/paymentcryptographydata/go.sum +++ b/service/paymentcryptographydata/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/pcaconnectorad/endpoints_test.go b/service/pcaconnectorad/endpoints_test.go index 118cb970071..45bebea6b4d 100644 --- a/service/pcaconnectorad/endpoints_test.go +++ b/service/pcaconnectorad/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/pcaconnectorad/generated.json b/service/pcaconnectorad/generated.json index 8ec75f66395..32f02ecba96 100644 --- a/service/pcaconnectorad/generated.json +++ b/service/pcaconnectorad/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/pcaconnectorad/go.mod b/service/pcaconnectorad/go.mod index ce8898eac8d..3b4d0e95fbf 100644 --- a/service/pcaconnectorad/go.mod +++ b/service/pcaconnectorad/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/pcaconnectorad/go.sum b/service/pcaconnectorad/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/pcaconnectorad/go.sum +++ b/service/pcaconnectorad/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/personalize/endpoints_test.go b/service/personalize/endpoints_test.go index 209296f2c51..4f522190cea 100644 --- a/service/personalize/endpoints_test.go +++ b/service/personalize/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -920,14 +876,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -979,14 +933,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1038,14 +990,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1097,14 +1047,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/personalize/generated.json b/service/personalize/generated.json index 3110f9afbd5..c299bb8d7a9 100644 --- a/service/personalize/generated.json +++ b/service/personalize/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/personalize/go.mod b/service/personalize/go.mod index 71ddb562ad6..ffdd48368f6 100644 --- a/service/personalize/go.mod +++ b/service/personalize/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/personalize/go.sum b/service/personalize/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/personalize/go.sum +++ b/service/personalize/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/personalizeevents/endpoints_test.go b/service/personalizeevents/endpoints_test.go index a4850817afc..a6b429ce43d 100644 --- a/service/personalizeevents/endpoints_test.go +++ b/service/personalizeevents/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/personalizeevents/generated.json b/service/personalizeevents/generated.json index 84a0bd963da..147066c2939 100644 --- a/service/personalizeevents/generated.json +++ b/service/personalizeevents/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/personalizeevents/go.mod b/service/personalizeevents/go.mod index ee5881ca947..3c040d5fa27 100644 --- a/service/personalizeevents/go.mod +++ b/service/personalizeevents/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/personalizeevents/go.sum b/service/personalizeevents/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/personalizeevents/go.sum +++ b/service/personalizeevents/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/personalizeruntime/endpoints_test.go b/service/personalizeruntime/endpoints_test.go index 4a509c7a57b..9d2502fd449 100644 --- a/service/personalizeruntime/endpoints_test.go +++ b/service/personalizeruntime/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/personalizeruntime/generated.json b/service/personalizeruntime/generated.json index 35f949b5808..b4f14fce8c0 100644 --- a/service/personalizeruntime/generated.json +++ b/service/personalizeruntime/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/personalizeruntime/go.mod b/service/personalizeruntime/go.mod index f00dedc227e..7442164076c 100644 --- a/service/personalizeruntime/go.mod +++ b/service/personalizeruntime/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/personalizeruntime/go.sum b/service/personalizeruntime/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/personalizeruntime/go.sum +++ b/service/personalizeruntime/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/pi/endpoints_test.go b/service/pi/endpoints_test.go index 8b67ddd08d5..83b6e3fce1b 100644 --- a/service/pi/endpoints_test.go +++ b/service/pi/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1349,14 +1283,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1408,14 +1340,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1467,14 +1397,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1526,14 +1454,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1605,14 +1529,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/pi/generated.json b/service/pi/generated.json index 6b0970a3501..e602344b6b7 100644 --- a/service/pi/generated.json +++ b/service/pi/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/pi/go.mod b/service/pi/go.mod index b42bb8143a0..18064964ae9 100644 --- a/service/pi/go.mod +++ b/service/pi/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/pi/go.sum b/service/pi/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/pi/go.sum +++ b/service/pi/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/pinpoint/endpoints_test.go b/service/pinpoint/endpoints_test.go index bf5dc811342..876e05eaf54 100644 --- a/service/pinpoint/endpoints_test.go +++ b/service/pinpoint/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1037,14 +987,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1096,14 +1044,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1155,14 +1101,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1214,14 +1158,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1254,14 +1196,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1293,14 +1233,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/pinpoint/generated.json b/service/pinpoint/generated.json index 342599d925d..c4b97220f3d 100644 --- a/service/pinpoint/generated.json +++ b/service/pinpoint/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/pinpoint/go.mod b/service/pinpoint/go.mod index 9a05ed0f41b..8b55f78c564 100644 --- a/service/pinpoint/go.mod +++ b/service/pinpoint/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/pinpoint/go.sum b/service/pinpoint/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/pinpoint/go.sum +++ b/service/pinpoint/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/pinpointemail/endpoints_test.go b/service/pinpointemail/endpoints_test.go index 6188393cc40..4f5ae9422ac 100644 --- a/service/pinpointemail/endpoints_test.go +++ b/service/pinpointemail/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1388,14 +1320,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1447,14 +1377,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1506,14 +1434,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1565,14 +1491,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1605,14 +1529,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/pinpointemail/generated.json b/service/pinpointemail/generated.json index 1e6d3134520..ea8455d40f3 100644 --- a/service/pinpointemail/generated.json +++ b/service/pinpointemail/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/pinpointemail/go.mod b/service/pinpointemail/go.mod index f50512c24e7..c05b64eb22e 100644 --- a/service/pinpointemail/go.mod +++ b/service/pinpointemail/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/pinpointemail/go.sum b/service/pinpointemail/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/pinpointemail/go.sum +++ b/service/pinpointemail/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/pinpointsmsvoice/endpoints_test.go b/service/pinpointsmsvoice/endpoints_test.go index 98fd34fd98c..c9e5a6e9a44 100644 --- a/service/pinpointsmsvoice/endpoints_test.go +++ b/service/pinpointsmsvoice/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/pinpointsmsvoice/generated.json b/service/pinpointsmsvoice/generated.json index 476e2357d70..e50352a9639 100644 --- a/service/pinpointsmsvoice/generated.json +++ b/service/pinpointsmsvoice/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/pinpointsmsvoice/go.mod b/service/pinpointsmsvoice/go.mod index de255b5b1c1..4e5163548e7 100644 --- a/service/pinpointsmsvoice/go.mod +++ b/service/pinpointsmsvoice/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/pinpointsmsvoice/go.sum b/service/pinpointsmsvoice/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/pinpointsmsvoice/go.sum +++ b/service/pinpointsmsvoice/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/pinpointsmsvoicev2/endpoints_test.go b/service/pinpointsmsvoicev2/endpoints_test.go index 33f7eed5b64..23665e821f5 100644 --- a/service/pinpointsmsvoicev2/endpoints_test.go +++ b/service/pinpointsmsvoicev2/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -920,14 +876,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -979,14 +933,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1038,14 +990,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1097,14 +1047,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/pinpointsmsvoicev2/generated.json b/service/pinpointsmsvoicev2/generated.json index 30d33357531..c881c01cdec 100644 --- a/service/pinpointsmsvoicev2/generated.json +++ b/service/pinpointsmsvoicev2/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/pinpointsmsvoicev2/go.mod b/service/pinpointsmsvoicev2/go.mod index d6ad968fbbd..985b58ec271 100644 --- a/service/pinpointsmsvoicev2/go.mod +++ b/service/pinpointsmsvoicev2/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/pinpointsmsvoicev2/go.sum b/service/pinpointsmsvoicev2/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/pinpointsmsvoicev2/go.sum +++ b/service/pinpointsmsvoicev2/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/pipes/endpoints_test.go b/service/pipes/endpoints_test.go index 3a310c6fc84..4ff43b59ee1 100644 --- a/service/pipes/endpoints_test.go +++ b/service/pipes/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/pipes/generated.json b/service/pipes/generated.json index c6931bc26a7..b08ff46f99e 100644 --- a/service/pipes/generated.json +++ b/service/pipes/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/pipes/go.mod b/service/pipes/go.mod index 6f48765e374..bee16ea38f4 100644 --- a/service/pipes/go.mod +++ b/service/pipes/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/pipes/go.sum b/service/pipes/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/pipes/go.sum +++ b/service/pipes/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/polly/endpoints_test.go b/service/polly/endpoints_test.go index 2fdb7b94dca..04fcff23612 100644 --- a/service/polly/endpoints_test.go +++ b/service/polly/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1466,14 +1394,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1525,14 +1451,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1584,14 +1508,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1643,14 +1565,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1722,14 +1640,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/polly/generated.json b/service/polly/generated.json index de4ffc4e8a3..a68c78a662b 100644 --- a/service/polly/generated.json +++ b/service/polly/generated.json @@ -5,8 +5,7 @@ "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding": "v1.0.5", "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url": "v1.0.7", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/polly/go.mod b/service/polly/go.mod index 1eca7fed29d..10a50e67e68 100644 --- a/service/polly/go.mod +++ b/service/polly/go.mod @@ -9,7 +9,6 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.4 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/polly/go.sum b/service/polly/go.sum index 35ac695fb99..d5d61042cef 100644 --- a/service/polly/go.sum +++ b/service/polly/go.sum @@ -1,4 +1,3 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/pricing/endpoints_test.go b/service/pricing/endpoints_test.go index 98b8617ba05..65f1fb99817 100644 --- a/service/pricing/endpoints_test.go +++ b/service/pricing/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -569,14 +543,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -628,14 +600,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -687,14 +657,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -746,14 +714,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/pricing/generated.json b/service/pricing/generated.json index f265fb0b2ba..ce22bfa7966 100644 --- a/service/pricing/generated.json +++ b/service/pricing/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/pricing/go.mod b/service/pricing/go.mod index e1916bff3f0..508e6b33afb 100644 --- a/service/pricing/go.mod +++ b/service/pricing/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/pricing/go.sum b/service/pricing/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/pricing/go.sum +++ b/service/pricing/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/privatenetworks/endpoints_test.go b/service/privatenetworks/endpoints_test.go index fa4bf0780cc..2334ce57374 100644 --- a/service/privatenetworks/endpoints_test.go +++ b/service/privatenetworks/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/privatenetworks/generated.json b/service/privatenetworks/generated.json index e4095c4893c..081d5f8d6a3 100644 --- a/service/privatenetworks/generated.json +++ b/service/privatenetworks/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/privatenetworks/go.mod b/service/privatenetworks/go.mod index 2ae726c2a4b..32410f8a178 100644 --- a/service/privatenetworks/go.mod +++ b/service/privatenetworks/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/privatenetworks/go.sum b/service/privatenetworks/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/privatenetworks/go.sum +++ b/service/privatenetworks/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/proton/endpoints_test.go b/service/proton/endpoints_test.go index c4164e5170d..576f53cd124 100644 --- a/service/proton/endpoints_test.go +++ b/service/proton/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -686,14 +654,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -745,14 +711,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -804,14 +768,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -863,14 +825,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -903,14 +863,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +900,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/proton/generated.json b/service/proton/generated.json index 5bd386b363e..d751d91d0c2 100644 --- a/service/proton/generated.json +++ b/service/proton/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/proton/go.mod b/service/proton/go.mod index 56237b7bac3..9a48f1633b1 100644 --- a/service/proton/go.mod +++ b/service/proton/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/proton/go.sum b/service/proton/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/proton/go.sum +++ b/service/proton/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/qbusiness/endpoints_test.go b/service/qbusiness/endpoints_test.go index 26ba222bbbd..8f443524e77 100644 --- a/service/qbusiness/endpoints_test.go +++ b/service/qbusiness/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -41,14 +41,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -79,14 +77,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -117,14 +113,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -155,14 +149,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -193,14 +185,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -231,14 +221,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -270,14 +258,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -308,14 +294,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/qbusiness/generated.json b/service/qbusiness/generated.json index 7105b1e2c2f..c748aec4cfb 100644 --- a/service/qbusiness/generated.json +++ b/service/qbusiness/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/qbusiness/go.mod b/service/qbusiness/go.mod index 52d13a04480..6b3869844b9 100644 --- a/service/qbusiness/go.mod +++ b/service/qbusiness/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/qbusiness/go.sum b/service/qbusiness/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/qbusiness/go.sum +++ b/service/qbusiness/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/qconnect/endpoints_test.go b/service/qconnect/endpoints_test.go index 31e6ce87618..c17bb9dd0cd 100644 --- a/service/qconnect/endpoints_test.go +++ b/service/qconnect/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/qconnect/generated.json b/service/qconnect/generated.json index cf85fc3e502..6f3fc950274 100644 --- a/service/qconnect/generated.json +++ b/service/qconnect/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/qconnect/go.mod b/service/qconnect/go.mod index 24ce87fe71a..63479d2cfe3 100644 --- a/service/qconnect/go.mod +++ b/service/qconnect/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/qconnect/go.sum b/service/qconnect/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/qconnect/go.sum +++ b/service/qconnect/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/qldb/endpoints_test.go b/service/qldb/endpoints_test.go index c5e63f8daa3..faed7769f07 100644 --- a/service/qldb/endpoints_test.go +++ b/service/qldb/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1037,14 +987,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1096,14 +1044,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1155,14 +1101,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1214,14 +1158,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1254,14 +1196,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1293,14 +1233,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/qldb/generated.json b/service/qldb/generated.json index 1a0ebcf4333..8f5bc323ea1 100644 --- a/service/qldb/generated.json +++ b/service/qldb/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/qldb/go.mod b/service/qldb/go.mod index fcf8734ea0b..fcc0e1b2adb 100644 --- a/service/qldb/go.mod +++ b/service/qldb/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/qldb/go.sum b/service/qldb/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/qldb/go.sum +++ b/service/qldb/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/qldbsession/endpoints_test.go b/service/qldbsession/endpoints_test.go index a487a04eda6..0a1c2886056 100644 --- a/service/qldbsession/endpoints_test.go +++ b/service/qldbsession/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -998,14 +950,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1057,14 +1007,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1116,14 +1064,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1175,14 +1121,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1215,14 +1159,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1254,14 +1196,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/qldbsession/generated.json b/service/qldbsession/generated.json index 3316a0129c9..fde0bb586f1 100644 --- a/service/qldbsession/generated.json +++ b/service/qldbsession/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/qldbsession/go.mod b/service/qldbsession/go.mod index 68cd23c92a3..1cb27f2180b 100644 --- a/service/qldbsession/go.mod +++ b/service/qldbsession/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/qldbsession/go.sum b/service/qldbsession/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/qldbsession/go.sum +++ b/service/qldbsession/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/quicksight/endpoints_test.go b/service/quicksight/endpoints_test.go index b2f5e34e951..1accb0c6cf4 100644 --- a/service/quicksight/endpoints_test.go +++ b/service/quicksight/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1115,14 +1061,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1174,14 +1118,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1233,14 +1175,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1292,14 +1232,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/quicksight/generated.json b/service/quicksight/generated.json index 79958bbc912..82630c46afd 100644 --- a/service/quicksight/generated.json +++ b/service/quicksight/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/quicksight/go.mod b/service/quicksight/go.mod index 6b250c92f84..482284a7b6d 100644 --- a/service/quicksight/go.mod +++ b/service/quicksight/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/quicksight/go.sum b/service/quicksight/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/quicksight/go.sum +++ b/service/quicksight/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/ram/endpoints_test.go b/service/ram/endpoints_test.go index 3108925e5f0..27526887dcd 100644 --- a/service/ram/endpoints_test.go +++ b/service/ram/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ram/generated.json b/service/ram/generated.json index b0edc6273aa..797dafe7574 100644 --- a/service/ram/generated.json +++ b/service/ram/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/ram/go.mod b/service/ram/go.mod index e9cfefce235..10eb9b9f657 100644 --- a/service/ram/go.mod +++ b/service/ram/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ram/go.sum b/service/ram/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/ram/go.sum +++ b/service/ram/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/rbin/endpoints_test.go b/service/rbin/endpoints_test.go index 50cc351a2c1..d3bcb1ed215 100644 --- a/service/rbin/endpoints_test.go +++ b/service/rbin/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1310,14 +1246,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1369,14 +1303,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1428,14 +1360,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1487,14 +1417,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1527,14 +1455,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/rbin/generated.json b/service/rbin/generated.json index 478f90e9609..f44af6060f3 100644 --- a/service/rbin/generated.json +++ b/service/rbin/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/rbin/go.mod b/service/rbin/go.mod index be1dbf0612d..19ded287f62 100644 --- a/service/rbin/go.mod +++ b/service/rbin/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/rbin/go.sum b/service/rbin/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/rbin/go.sum +++ b/service/rbin/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/rds/endpoints_test.go b/service/rds/endpoints_test.go index e7752bf7759..58d64f34649 100644 --- a/service/rds/endpoints_test.go +++ b/service/rds/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1641,14 +1559,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1700,14 +1616,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1759,14 +1673,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1818,14 +1730,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1917,14 +1825,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/rds/generated.json b/service/rds/generated.json index 7712a975718..e6d564a207f 100644 --- a/service/rds/generated.json +++ b/service/rds/generated.json @@ -6,7 +6,6 @@ "github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding": "v1.0.5", "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url": "v1.0.7", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/rds/go.mod b/service/rds/go.mod index 64fcc46c0fb..2135957b1ee 100644 --- a/service/rds/go.mod +++ b/service/rds/go.mod @@ -9,7 +9,6 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.4 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/rds/go.sum b/service/rds/go.sum index 373314e89bc..2230ad62888 100644 --- a/service/rds/go.sum +++ b/service/rds/go.sum @@ -3,7 +3,6 @@ github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/rdsdata/endpoints_test.go b/service/rdsdata/endpoints_test.go index 9d36f45f5ce..bc2353a385f 100644 --- a/service/rdsdata/endpoints_test.go +++ b/service/rdsdata/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/rdsdata/generated.json b/service/rdsdata/generated.json index e5472e1fd0a..71f54aca70f 100644 --- a/service/rdsdata/generated.json +++ b/service/rdsdata/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/rdsdata/go.mod b/service/rdsdata/go.mod index e3f3df2231b..81fe6a89f26 100644 --- a/service/rdsdata/go.mod +++ b/service/rdsdata/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/rdsdata/go.sum b/service/rdsdata/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/rdsdata/go.sum +++ b/service/rdsdata/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/redshift/endpoints_test.go b/service/redshift/endpoints_test.go index 7dde36594ac..613cd67ad36 100644 --- a/service/redshift/endpoints_test.go +++ b/service/redshift/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1641,14 +1559,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1700,14 +1616,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1759,14 +1673,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1818,14 +1730,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1917,14 +1825,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/redshift/generated.json b/service/redshift/generated.json index f2838f7d5d2..faacb104df8 100644 --- a/service/redshift/generated.json +++ b/service/redshift/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/redshift/go.mod b/service/redshift/go.mod index 411f689070f..3858c441675 100644 --- a/service/redshift/go.mod +++ b/service/redshift/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/redshift/go.sum b/service/redshift/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/redshift/go.sum +++ b/service/redshift/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/redshiftdata/endpoints_test.go b/service/redshiftdata/endpoints_test.go index 11a8f63bc9b..1d5b0a2a87d 100644 --- a/service/redshiftdata/endpoints_test.go +++ b/service/redshiftdata/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/redshiftdata/generated.json b/service/redshiftdata/generated.json index 58a2fea9c72..1a406a12ed9 100644 --- a/service/redshiftdata/generated.json +++ b/service/redshiftdata/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/redshiftdata/go.mod b/service/redshiftdata/go.mod index c15d80a5fb1..c533c1c9205 100644 --- a/service/redshiftdata/go.mod +++ b/service/redshiftdata/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/redshiftdata/go.sum b/service/redshiftdata/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/redshiftdata/go.sum +++ b/service/redshiftdata/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/redshiftserverless/endpoints_test.go b/service/redshiftserverless/endpoints_test.go index 4bf748d4fe0..5c73823c8c8 100644 --- a/service/redshiftserverless/endpoints_test.go +++ b/service/redshiftserverless/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -920,14 +876,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -979,14 +933,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1038,14 +990,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1097,14 +1047,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1176,14 +1122,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/redshiftserverless/generated.json b/service/redshiftserverless/generated.json index 3e43cad5e80..94f82d0ae21 100644 --- a/service/redshiftserverless/generated.json +++ b/service/redshiftserverless/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/redshiftserverless/go.mod b/service/redshiftserverless/go.mod index f4f46338ac6..68c3c7a85ed 100644 --- a/service/redshiftserverless/go.mod +++ b/service/redshiftserverless/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/redshiftserverless/go.sum b/service/redshiftserverless/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/redshiftserverless/go.sum +++ b/service/redshiftserverless/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/rekognition/endpoints_test.go b/service/rekognition/endpoints_test.go index 4275e2a6d84..cc0923a11d7 100644 --- a/service/rekognition/endpoints_test.go +++ b/service/rekognition/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1232,14 +1172,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1291,14 +1229,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1350,14 +1286,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1409,14 +1343,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1449,14 +1381,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1488,14 +1418,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/rekognition/generated.json b/service/rekognition/generated.json index 23f59e9c815..4f7136ee09c 100644 --- a/service/rekognition/generated.json +++ b/service/rekognition/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/rekognition/go.mod b/service/rekognition/go.mod index 6780e93ca9b..e4a3f22cfae 100644 --- a/service/rekognition/go.mod +++ b/service/rekognition/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/rekognition/go.sum b/service/rekognition/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/rekognition/go.sum +++ b/service/rekognition/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/repostspace/endpoints_test.go b/service/repostspace/endpoints_test.go index edaf8b9fa8a..a47355c4ebf 100644 --- a/service/repostspace/endpoints_test.go +++ b/service/repostspace/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/repostspace/generated.json b/service/repostspace/generated.json index 26b749b415b..0fc2be20184 100644 --- a/service/repostspace/generated.json +++ b/service/repostspace/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/repostspace/go.mod b/service/repostspace/go.mod index 4596fda0407..d1babf8961e 100644 --- a/service/repostspace/go.mod +++ b/service/repostspace/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/repostspace/go.sum b/service/repostspace/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/repostspace/go.sum +++ b/service/repostspace/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/resiliencehub/endpoints_test.go b/service/resiliencehub/endpoints_test.go index dd4ac3c6cae..bbbae595180 100644 --- a/service/resiliencehub/endpoints_test.go +++ b/service/resiliencehub/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1271,14 +1209,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1330,14 +1266,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1389,14 +1323,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1448,14 +1380,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1488,14 +1418,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1527,14 +1455,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/resiliencehub/generated.json b/service/resiliencehub/generated.json index b52ec73d029..ab8887fbce3 100644 --- a/service/resiliencehub/generated.json +++ b/service/resiliencehub/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/resiliencehub/go.mod b/service/resiliencehub/go.mod index 876f4374780..541c92461d9 100644 --- a/service/resiliencehub/go.mod +++ b/service/resiliencehub/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/resiliencehub/go.sum b/service/resiliencehub/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/resiliencehub/go.sum +++ b/service/resiliencehub/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/resourceexplorer2/endpoints_test.go b/service/resourceexplorer2/endpoints_test.go index cb3e0bf7e2f..c7c2d111100 100644 --- a/service/resourceexplorer2/endpoints_test.go +++ b/service/resourceexplorer2/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/resourceexplorer2/generated.json b/service/resourceexplorer2/generated.json index 3a1a58d6de4..294c0930f14 100644 --- a/service/resourceexplorer2/generated.json +++ b/service/resourceexplorer2/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/resourceexplorer2/go.mod b/service/resourceexplorer2/go.mod index 96b61944408..23b017a20f1 100644 --- a/service/resourceexplorer2/go.mod +++ b/service/resourceexplorer2/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/resourceexplorer2/go.sum b/service/resourceexplorer2/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/resourceexplorer2/go.sum +++ b/service/resourceexplorer2/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/resourcegroups/endpoints_test.go b/service/resourcegroups/endpoints_test.go index e55aa2113b0..17cac6f9c6a 100644 --- a/service/resourcegroups/endpoints_test.go +++ b/service/resourcegroups/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1642,14 +1562,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1701,14 +1619,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1760,14 +1676,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/resourcegroups/generated.json b/service/resourcegroups/generated.json index 494427b84b4..bf6177598fc 100644 --- a/service/resourcegroups/generated.json +++ b/service/resourcegroups/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/resourcegroups/go.mod b/service/resourcegroups/go.mod index 3569d030619..298d38ddd61 100644 --- a/service/resourcegroups/go.mod +++ b/service/resourcegroups/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/resourcegroups/go.sum b/service/resourcegroups/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/resourcegroups/go.sum +++ b/service/resourcegroups/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/resourcegroupstaggingapi/endpoints_test.go b/service/resourcegroupstaggingapi/endpoints_test.go index a946756b713..26ab75c7c36 100644 --- a/service/resourcegroupstaggingapi/endpoints_test.go +++ b/service/resourcegroupstaggingapi/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1466,14 +1394,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1525,14 +1451,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1584,14 +1508,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/resourcegroupstaggingapi/generated.json b/service/resourcegroupstaggingapi/generated.json index 78d26f5ca9c..b00fce4906a 100644 --- a/service/resourcegroupstaggingapi/generated.json +++ b/service/resourcegroupstaggingapi/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/resourcegroupstaggingapi/go.mod b/service/resourcegroupstaggingapi/go.mod index 442a2b15603..5b95f9da7bc 100644 --- a/service/resourcegroupstaggingapi/go.mod +++ b/service/resourcegroupstaggingapi/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/resourcegroupstaggingapi/go.sum b/service/resourcegroupstaggingapi/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/resourcegroupstaggingapi/go.sum +++ b/service/resourcegroupstaggingapi/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/robomaker/endpoints_test.go b/service/robomaker/endpoints_test.go index 4e9cf87d496..96a2df452d8 100644 --- a/service/robomaker/endpoints_test.go +++ b/service/robomaker/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -803,14 +765,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -862,14 +822,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -921,14 +879,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -980,14 +936,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1020,14 +974,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1059,14 +1011,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/robomaker/generated.json b/service/robomaker/generated.json index 9e9f9d6f745..75634437f54 100644 --- a/service/robomaker/generated.json +++ b/service/robomaker/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/robomaker/go.mod b/service/robomaker/go.mod index 40d3c9afbc9..77aa0e08e2b 100644 --- a/service/robomaker/go.mod +++ b/service/robomaker/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/robomaker/go.sum b/service/robomaker/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/robomaker/go.sum +++ b/service/robomaker/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/rolesanywhere/endpoints_test.go b/service/rolesanywhere/endpoints_test.go index 1e335400a52..9db63dfe054 100644 --- a/service/rolesanywhere/endpoints_test.go +++ b/service/rolesanywhere/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1232,14 +1172,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1291,14 +1229,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1350,14 +1286,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1409,14 +1343,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1449,14 +1381,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1488,14 +1418,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/rolesanywhere/generated.json b/service/rolesanywhere/generated.json index 08fb90d972c..3a96c706b3c 100644 --- a/service/rolesanywhere/generated.json +++ b/service/rolesanywhere/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/rolesanywhere/go.mod b/service/rolesanywhere/go.mod index feba89f6a61..f12106c3e65 100644 --- a/service/rolesanywhere/go.mod +++ b/service/rolesanywhere/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/rolesanywhere/go.sum b/service/rolesanywhere/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/rolesanywhere/go.sum +++ b/service/rolesanywhere/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/route53/endpoints_test.go b/service/route53/endpoints_test.go index 5ed5a6fc53e..7ebd73e2514 100644 --- a/service/route53/endpoints_test.go +++ b/service/route53/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -60,14 +60,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -115,14 +113,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -154,14 +150,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -209,14 +203,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -248,14 +240,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -303,14 +293,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -358,14 +346,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -397,14 +383,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -436,14 +420,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -475,14 +457,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +510,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -585,14 +563,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -640,14 +616,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -679,14 +653,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -734,14 +706,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -773,14 +743,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -828,14 +796,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -883,14 +849,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +906,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +979,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1072,14 +1032,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1131,14 +1089,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1206,14 +1162,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1261,14 +1215,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1316,14 +1268,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1356,14 +1306,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1395,14 +1343,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/route53/generated.json b/service/route53/generated.json index 7d42783dcd7..c0507f4d9a9 100644 --- a/service/route53/generated.json +++ b/service/route53/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/route53/go.mod b/service/route53/go.mod index 0ed0a60f57a..0915e1089f0 100644 --- a/service/route53/go.mod +++ b/service/route53/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/route53/go.sum b/service/route53/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/route53/go.sum +++ b/service/route53/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/route53domains/endpoints_test.go b/service/route53domains/endpoints_test.go index d963fc77970..33788267fad 100644 --- a/service/route53domains/endpoints_test.go +++ b/service/route53domains/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/route53domains/generated.json b/service/route53domains/generated.json index 1ef7494a4c5..a471aec0934 100644 --- a/service/route53domains/generated.json +++ b/service/route53domains/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/route53domains/go.mod b/service/route53domains/go.mod index 58bf96a39d9..7c20dd90d08 100644 --- a/service/route53domains/go.mod +++ b/service/route53domains/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/route53domains/go.sum b/service/route53domains/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/route53domains/go.sum +++ b/service/route53domains/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/route53recoverycluster/endpoints_test.go b/service/route53recoverycluster/endpoints_test.go index 7d68294e136..f4710fd8abc 100644 --- a/service/route53recoverycluster/endpoints_test.go +++ b/service/route53recoverycluster/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/route53recoverycluster/generated.json b/service/route53recoverycluster/generated.json index c959bab0ada..3147110c7e2 100644 --- a/service/route53recoverycluster/generated.json +++ b/service/route53recoverycluster/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/route53recoverycluster/go.mod b/service/route53recoverycluster/go.mod index 79bbad81dc3..c3526965893 100644 --- a/service/route53recoverycluster/go.mod +++ b/service/route53recoverycluster/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/route53recoverycluster/go.sum b/service/route53recoverycluster/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/route53recoverycluster/go.sum +++ b/service/route53recoverycluster/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/route53recoverycontrolconfig/endpoints_test.go b/service/route53recoverycontrolconfig/endpoints_test.go index 36d78d7f7ca..d11949fa2a8 100644 --- a/service/route53recoverycontrolconfig/endpoints_test.go +++ b/service/route53recoverycontrolconfig/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -60,14 +60,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -99,14 +97,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -138,14 +134,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -177,14 +171,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -216,14 +208,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -255,14 +245,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -294,14 +282,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -333,14 +319,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -372,14 +356,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -411,14 +393,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -450,14 +430,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -489,14 +467,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -528,14 +504,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -587,14 +561,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -646,14 +618,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +675,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -764,14 +732,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -804,14 +770,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -843,14 +807,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/route53recoverycontrolconfig/generated.json b/service/route53recoverycontrolconfig/generated.json index 6125ac2734e..cbd907f2c6c 100644 --- a/service/route53recoverycontrolconfig/generated.json +++ b/service/route53recoverycontrolconfig/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/route53recoverycontrolconfig/go.mod b/service/route53recoverycontrolconfig/go.mod index a69585e30fd..dce0cd8669c 100644 --- a/service/route53recoverycontrolconfig/go.mod +++ b/service/route53recoverycontrolconfig/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/route53recoverycontrolconfig/go.sum b/service/route53recoverycontrolconfig/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/route53recoverycontrolconfig/go.sum +++ b/service/route53recoverycontrolconfig/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/route53recoveryreadiness/endpoints_test.go b/service/route53recoveryreadiness/endpoints_test.go index 5375b300193..e4f50ad86c7 100644 --- a/service/route53recoveryreadiness/endpoints_test.go +++ b/service/route53recoveryreadiness/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/route53recoveryreadiness/generated.json b/service/route53recoveryreadiness/generated.json index 549eda70a75..537e48bb31e 100644 --- a/service/route53recoveryreadiness/generated.json +++ b/service/route53recoveryreadiness/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/route53recoveryreadiness/go.mod b/service/route53recoveryreadiness/go.mod index d55c33082ae..89c65dd467b 100644 --- a/service/route53recoveryreadiness/go.mod +++ b/service/route53recoveryreadiness/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/route53recoveryreadiness/go.sum b/service/route53recoveryreadiness/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/route53recoveryreadiness/go.sum +++ b/service/route53recoveryreadiness/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/route53resolver/endpoints_test.go b/service/route53resolver/endpoints_test.go index 158bf5df8ed..fd19292fd4d 100644 --- a/service/route53resolver/endpoints_test.go +++ b/service/route53resolver/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1505,14 +1431,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1584,14 +1508,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1643,14 +1565,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1722,14 +1640,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/route53resolver/generated.json b/service/route53resolver/generated.json index e47a92699ba..251caf1f7eb 100644 --- a/service/route53resolver/generated.json +++ b/service/route53resolver/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/route53resolver/go.mod b/service/route53resolver/go.mod index ae19ee249b6..bcd1e593287 100644 --- a/service/route53resolver/go.mod +++ b/service/route53resolver/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/route53resolver/go.sum b/service/route53resolver/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/route53resolver/go.sum +++ b/service/route53resolver/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/rum/endpoints_test.go b/service/rum/endpoints_test.go index 118f380b5e1..98c7f5b319d 100644 --- a/service/rum/endpoints_test.go +++ b/service/rum/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -881,14 +839,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -940,14 +896,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -999,14 +953,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1058,14 +1010,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1098,14 +1048,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1137,14 +1085,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/rum/generated.json b/service/rum/generated.json index cf7bb58271a..cb3b296c4ae 100644 --- a/service/rum/generated.json +++ b/service/rum/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/rum/go.mod b/service/rum/go.mod index f8b3a344ca0..0cc1180a7bf 100644 --- a/service/rum/go.mod +++ b/service/rum/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/rum/go.sum b/service/rum/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/rum/go.sum +++ b/service/rum/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/s3/endpoints_test.go b/service/s3/endpoints_test.go index 3171d4131c1..183b558ecf7 100644 --- a/service/s3/endpoints_test.go +++ b/service/s3/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -196,14 +196,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -371,14 +369,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -431,14 +427,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -491,14 +485,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -643,14 +635,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -749,14 +739,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -831,14 +819,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -890,14 +876,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -950,14 +934,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1010,14 +992,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1070,14 +1050,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1153,14 +1131,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1237,14 +1213,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1298,14 +1272,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1354,14 +1326,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1410,14 +1380,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1466,14 +1434,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1522,14 +1488,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1579,14 +1543,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1656,14 +1618,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1715,14 +1675,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1774,14 +1732,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1834,14 +1790,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1894,14 +1848,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1954,14 +1906,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2014,14 +1964,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2074,14 +2022,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2134,14 +2080,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2192,14 +2136,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2250,14 +2192,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2308,14 +2248,12 @@ func TestEndpointCase51(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2366,14 +2304,12 @@ func TestEndpointCase52(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2425,14 +2361,12 @@ func TestEndpointCase53(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2485,14 +2419,12 @@ func TestEndpointCase54(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2544,14 +2476,12 @@ func TestEndpointCase55(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2606,14 +2536,12 @@ func TestEndpointCase56(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2665,14 +2593,12 @@ func TestEndpointCase57(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2725,14 +2651,12 @@ func TestEndpointCase58(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2785,14 +2709,12 @@ func TestEndpointCase59(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2845,14 +2767,12 @@ func TestEndpointCase60(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2905,14 +2825,12 @@ func TestEndpointCase61(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2966,14 +2884,12 @@ func TestEndpointCase62(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3027,14 +2943,12 @@ func TestEndpointCase63(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3088,14 +3002,12 @@ func TestEndpointCase64(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3149,14 +3061,12 @@ func TestEndpointCase65(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3210,14 +3120,12 @@ func TestEndpointCase66(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3271,14 +3179,12 @@ func TestEndpointCase67(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3331,14 +3237,12 @@ func TestEndpointCase68(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3391,14 +3295,12 @@ func TestEndpointCase69(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3452,14 +3354,12 @@ func TestEndpointCase70(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3513,14 +3413,12 @@ func TestEndpointCase71(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3574,14 +3472,12 @@ func TestEndpointCase72(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3635,14 +3531,12 @@ func TestEndpointCase73(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3697,14 +3591,12 @@ func TestEndpointCase74(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3760,14 +3652,12 @@ func TestEndpointCase75(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3820,14 +3710,12 @@ func TestEndpointCase76(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3896,14 +3784,12 @@ func TestEndpointCase78(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3956,14 +3842,12 @@ func TestEndpointCase79(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4077,14 +3961,12 @@ func TestEndpointCase83(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4154,14 +4036,12 @@ func TestEndpointCase85(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4211,14 +4091,12 @@ func TestEndpointCase86(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4268,14 +4146,12 @@ func TestEndpointCase87(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4325,14 +4201,12 @@ func TestEndpointCase88(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4385,14 +4259,12 @@ func TestEndpointCase89(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4444,14 +4316,12 @@ func TestEndpointCase90(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4504,14 +4374,12 @@ func TestEndpointCase91(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4562,14 +4430,12 @@ func TestEndpointCase92(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4621,14 +4487,12 @@ func TestEndpointCase93(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4726,14 +4590,12 @@ func TestEndpointCase96(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4786,14 +4648,12 @@ func TestEndpointCase97(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4845,14 +4705,12 @@ func TestEndpointCase98(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4928,14 +4786,12 @@ func TestEndpointCase100(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4988,14 +4844,12 @@ func TestEndpointCase101(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5048,14 +4902,12 @@ func TestEndpointCase102(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5109,14 +4961,12 @@ func TestEndpointCase103(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5194,14 +5044,12 @@ func TestEndpointCase105(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5340,14 +5188,12 @@ func TestEndpointCase110(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5400,14 +5246,12 @@ func TestEndpointCase111(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5459,14 +5303,12 @@ func TestEndpointCase112(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5515,14 +5357,12 @@ func TestEndpointCase113(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5598,14 +5438,12 @@ func TestEndpointCase115(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5679,14 +5517,12 @@ func TestEndpointCase117(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5740,14 +5576,12 @@ func TestEndpointCase118(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5839,14 +5673,12 @@ func TestEndpointCase121(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5917,14 +5749,12 @@ func TestEndpointCase123(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -6247,14 +6077,12 @@ func TestEndpointCase138(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -6305,14 +6133,12 @@ func TestEndpointCase139(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -6362,14 +6188,12 @@ func TestEndpointCase140(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -6420,14 +6244,12 @@ func TestEndpointCase141(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -6478,14 +6300,12 @@ func TestEndpointCase142(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -6537,14 +6357,12 @@ func TestEndpointCase143(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -6597,14 +6415,12 @@ func TestEndpointCase144(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -6657,14 +6473,12 @@ func TestEndpointCase145(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -6717,14 +6531,12 @@ func TestEndpointCase146(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -6777,14 +6589,12 @@ func TestEndpointCase147(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -6837,14 +6647,12 @@ func TestEndpointCase148(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -6897,14 +6705,12 @@ func TestEndpointCase149(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -6980,14 +6786,12 @@ func TestEndpointCase151(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -7040,14 +6844,12 @@ func TestEndpointCase152(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -7146,14 +6948,12 @@ func TestEndpointCase155(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -7206,14 +7006,12 @@ func TestEndpointCase156(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -7266,14 +7064,12 @@ func TestEndpointCase157(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -7326,14 +7122,12 @@ func TestEndpointCase158(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -7386,14 +7180,12 @@ func TestEndpointCase159(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -7446,14 +7238,12 @@ func TestEndpointCase160(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -7529,14 +7319,12 @@ func TestEndpointCase162(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -7588,14 +7376,12 @@ func TestEndpointCase163(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -7671,14 +7457,12 @@ func TestEndpointCase165(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -7754,14 +7538,12 @@ func TestEndpointCase167(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -7813,14 +7595,12 @@ func TestEndpointCase168(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -7873,14 +7653,12 @@ func TestEndpointCase169(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -7979,14 +7757,12 @@ func TestEndpointCase172(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -8062,14 +7838,12 @@ func TestEndpointCase174(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -8121,14 +7895,12 @@ func TestEndpointCase175(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -8181,14 +7953,12 @@ func TestEndpointCase176(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -8241,14 +8011,12 @@ func TestEndpointCase177(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -8324,14 +8092,12 @@ func TestEndpointCase179(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -8407,14 +8173,12 @@ func TestEndpointCase181(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -8466,14 +8230,12 @@ func TestEndpointCase182(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -8527,14 +8289,12 @@ func TestEndpointCase183(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -8588,14 +8348,12 @@ func TestEndpointCase184(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -8721,14 +8479,12 @@ func TestEndpointCase188(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -8782,14 +8538,12 @@ func TestEndpointCase189(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -8843,14 +8597,12 @@ func TestEndpointCase190(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -8975,14 +8727,12 @@ func TestEndpointCase194(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -9036,14 +8786,12 @@ func TestEndpointCase195(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -9097,14 +8845,12 @@ func TestEndpointCase196(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -9230,14 +8976,12 @@ func TestEndpointCase200(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -9290,14 +9034,12 @@ func TestEndpointCase201(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -9350,14 +9092,12 @@ func TestEndpointCase202(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -9433,14 +9173,12 @@ func TestEndpointCase204(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -9493,14 +9231,12 @@ func TestEndpointCase205(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -9622,14 +9358,12 @@ func TestEndpointCase209(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -9682,14 +9416,12 @@ func TestEndpointCase210(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -9765,14 +9497,12 @@ func TestEndpointCase212(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -9824,14 +9554,12 @@ func TestEndpointCase213(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -9884,14 +9612,12 @@ func TestEndpointCase214(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -9994,14 +9720,12 @@ func TestEndpointCase217(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -10054,14 +9778,12 @@ func TestEndpointCase218(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -10138,14 +9860,12 @@ func TestEndpointCase220(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -10286,14 +10006,12 @@ func TestEndpointCase225(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -10346,14 +10064,12 @@ func TestEndpointCase226(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -10406,14 +10122,12 @@ func TestEndpointCase227(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -10466,14 +10180,12 @@ func TestEndpointCase228(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -10526,14 +10238,12 @@ func TestEndpointCase229(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -10609,14 +10319,12 @@ func TestEndpointCase231(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -10739,14 +10447,12 @@ func TestEndpointCase235(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -10799,14 +10505,12 @@ func TestEndpointCase236(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -11113,14 +10817,12 @@ func TestEndpointCase248(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -11196,14 +10898,12 @@ func TestEndpointCase250(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -11256,14 +10956,12 @@ func TestEndpointCase251(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -11315,14 +11013,12 @@ func TestEndpointCase252(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -11374,14 +11070,12 @@ func TestEndpointCase253(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -11521,14 +11215,12 @@ func TestEndpointCase258(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -11580,14 +11272,12 @@ func TestEndpointCase259(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -11639,14 +11329,12 @@ func TestEndpointCase260(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -11698,14 +11386,12 @@ func TestEndpointCase261(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -11757,14 +11443,12 @@ func TestEndpointCase262(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -11817,14 +11501,12 @@ func TestEndpointCase263(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -11877,14 +11559,12 @@ func TestEndpointCase264(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -12025,14 +11705,12 @@ func TestEndpointCase269(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -12084,14 +11762,12 @@ func TestEndpointCase270(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -12144,14 +11820,12 @@ func TestEndpointCase271(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -12204,14 +11878,12 @@ func TestEndpointCase272(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -12265,14 +11937,12 @@ func TestEndpointCase273(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -12326,14 +11996,12 @@ func TestEndpointCase274(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -12387,14 +12055,12 @@ func TestEndpointCase275(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -12448,14 +12114,12 @@ func TestEndpointCase276(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -12510,14 +12174,12 @@ func TestEndpointCase277(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -12572,14 +12234,12 @@ func TestEndpointCase278(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -12633,14 +12293,12 @@ func TestEndpointCase279(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -12694,14 +12352,12 @@ func TestEndpointCase280(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -12755,14 +12411,12 @@ func TestEndpointCase281(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -12816,14 +12470,12 @@ func TestEndpointCase282(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -12878,14 +12530,12 @@ func TestEndpointCase283(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -12940,14 +12590,12 @@ func TestEndpointCase284(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -13003,14 +12651,12 @@ func TestEndpointCase285(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -13065,14 +12711,12 @@ func TestEndpointCase286(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -13126,14 +12770,12 @@ func TestEndpointCase287(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -13189,14 +12831,12 @@ func TestEndpointCase288(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -13250,14 +12890,12 @@ func TestEndpointCase289(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/s3/generated.json b/service/s3/generated.json index da4230dcb7c..6e392285ef5 100644 --- a/service/s3/generated.json +++ b/service/s3/generated.json @@ -9,8 +9,7 @@ "github.com/aws/aws-sdk-go-v2/service/internal/checksum": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url": "v1.0.7", "github.com/aws/aws-sdk-go-v2/service/internal/s3shared": "v1.2.3", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/s3control/endpoints_test.go b/service/s3control/endpoints_test.go index dc05ab8028d..f32465be7f0 100644 --- a/service/s3control/endpoints_test.go +++ b/service/s3control/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -70,14 +70,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -135,14 +133,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -200,14 +196,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -265,14 +259,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -330,14 +322,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -395,14 +385,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -460,14 +448,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -525,14 +511,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -590,14 +574,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -655,14 +637,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -720,14 +700,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -785,14 +763,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -850,14 +826,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -910,14 +884,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -970,14 +942,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1029,14 +999,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1089,14 +1057,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1148,14 +1114,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1208,14 +1172,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1273,14 +1235,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1338,14 +1298,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1403,14 +1361,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1530,14 +1486,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1596,14 +1550,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1681,14 +1633,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1747,14 +1697,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1854,14 +1802,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1919,14 +1865,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1980,14 +1924,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2041,14 +1983,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2101,14 +2041,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2162,14 +2100,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2249,14 +2185,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2314,14 +2248,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2378,14 +2310,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2442,14 +2372,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2506,14 +2434,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2570,14 +2496,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2634,14 +2558,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2699,14 +2621,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2763,14 +2683,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2827,14 +2745,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2891,14 +2807,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2955,14 +2869,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3019,14 +2931,12 @@ func TestEndpointCase51(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3084,14 +2994,12 @@ func TestEndpointCase52(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3148,14 +3056,12 @@ func TestEndpointCase53(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3212,14 +3118,12 @@ func TestEndpointCase54(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3276,14 +3180,12 @@ func TestEndpointCase55(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3423,14 +3325,12 @@ func TestEndpointCase60(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3482,14 +3382,12 @@ func TestEndpointCase61(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3541,14 +3439,12 @@ func TestEndpointCase62(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3600,14 +3496,12 @@ func TestEndpointCase63(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3655,14 +3549,12 @@ func TestEndpointCase64(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3711,14 +3603,12 @@ func TestEndpointCase65(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3767,14 +3657,12 @@ func TestEndpointCase66(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3824,14 +3712,12 @@ func TestEndpointCase67(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3879,14 +3765,12 @@ func TestEndpointCase68(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3958,14 +3842,12 @@ func TestEndpointCase70(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4039,14 +3921,12 @@ func TestEndpointCase72(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4098,14 +3978,12 @@ func TestEndpointCase73(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4156,14 +4034,12 @@ func TestEndpointCase74(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4275,14 +4151,12 @@ func TestEndpointCase78(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4332,14 +4206,12 @@ func TestEndpointCase79(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4389,14 +4261,12 @@ func TestEndpointCase80(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4616,14 +4486,12 @@ func TestEndpointCase89(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4681,14 +4549,12 @@ func TestEndpointCase90(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4878,14 +4744,12 @@ func TestEndpointCase97(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -4993,14 +4857,12 @@ func TestEndpointCase100(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5057,14 +4919,12 @@ func TestEndpointCase101(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5192,14 +5052,12 @@ func TestEndpointCase105(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5251,14 +5109,12 @@ func TestEndpointCase106(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5309,14 +5165,12 @@ func TestEndpointCase107(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5368,14 +5222,12 @@ func TestEndpointCase108(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -5427,14 +5279,12 @@ func TestEndpointCase109(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/s3control/generated.json b/service/s3control/generated.json index ccd9907c137..93b8399f5c4 100644 --- a/service/s3control/generated.json +++ b/service/s3control/generated.json @@ -4,8 +4,7 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/service/internal/s3shared": "v1.2.3", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/s3control/go.mod b/service/s3control/go.mod index 95ba3153a14..6fb261b375a 100644 --- a/service/s3control/go.mod +++ b/service/s3control/go.mod @@ -8,7 +8,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/s3control/go.sum b/service/s3control/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/s3control/go.sum +++ b/service/s3control/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/s3outposts/endpoints_test.go b/service/s3outposts/endpoints_test.go index dc60982acfc..fac522da059 100644 --- a/service/s3outposts/endpoints_test.go +++ b/service/s3outposts/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1310,14 +1246,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1369,14 +1303,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1428,14 +1360,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1487,14 +1417,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1527,14 +1455,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/s3outposts/generated.json b/service/s3outposts/generated.json index d63c93ecde6..6c9710e2305 100644 --- a/service/s3outposts/generated.json +++ b/service/s3outposts/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/s3outposts/go.mod b/service/s3outposts/go.mod index 543298bac15..578e1bb148e 100644 --- a/service/s3outposts/go.mod +++ b/service/s3outposts/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/s3outposts/go.sum b/service/s3outposts/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/s3outposts/go.sum +++ b/service/s3outposts/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/sagemaker/endpoints_test.go b/service/sagemaker/endpoints_test.go index c859807dbb2..7b9247e9356 100644 --- a/service/sagemaker/endpoints_test.go +++ b/service/sagemaker/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1662,14 +1582,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1721,14 +1639,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1761,14 +1677,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/sagemaker/generated.json b/service/sagemaker/generated.json index 8c6d92e313d..b1522da76b0 100644 --- a/service/sagemaker/generated.json +++ b/service/sagemaker/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/sagemaker/go.mod b/service/sagemaker/go.mod index a4ff750b282..26dc9b42c6b 100644 --- a/service/sagemaker/go.mod +++ b/service/sagemaker/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/sagemaker/go.sum b/service/sagemaker/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/sagemaker/go.sum +++ b/service/sagemaker/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/sagemakera2iruntime/endpoints_test.go b/service/sagemakera2iruntime/endpoints_test.go index 8fb4c579862..a25ecb53264 100644 --- a/service/sagemakera2iruntime/endpoints_test.go +++ b/service/sagemakera2iruntime/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/sagemakera2iruntime/generated.json b/service/sagemakera2iruntime/generated.json index b26ceb5301a..c24dd7d8368 100644 --- a/service/sagemakera2iruntime/generated.json +++ b/service/sagemakera2iruntime/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/sagemakera2iruntime/go.mod b/service/sagemakera2iruntime/go.mod index 0275ec2c0e8..673b312193f 100644 --- a/service/sagemakera2iruntime/go.mod +++ b/service/sagemakera2iruntime/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sagemakera2iruntime/go.sum b/service/sagemakera2iruntime/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/sagemakera2iruntime/go.sum +++ b/service/sagemakera2iruntime/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/sagemakeredge/endpoints_test.go b/service/sagemakeredge/endpoints_test.go index dca4da875ee..9ef91720a3b 100644 --- a/service/sagemakeredge/endpoints_test.go +++ b/service/sagemakeredge/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -725,14 +691,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -784,14 +748,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -843,14 +805,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -902,14 +862,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +900,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/sagemakeredge/generated.json b/service/sagemakeredge/generated.json index 18096327176..749d89ff946 100644 --- a/service/sagemakeredge/generated.json +++ b/service/sagemakeredge/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/sagemakeredge/go.mod b/service/sagemakeredge/go.mod index 0baae829fcd..e66356614f2 100644 --- a/service/sagemakeredge/go.mod +++ b/service/sagemakeredge/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sagemakeredge/go.sum b/service/sagemakeredge/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/sagemakeredge/go.sum +++ b/service/sagemakeredge/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/sagemakerfeaturestoreruntime/endpoints_test.go b/service/sagemakerfeaturestoreruntime/endpoints_test.go index 90299bf2a73..a369a59b654 100644 --- a/service/sagemakerfeaturestoreruntime/endpoints_test.go +++ b/service/sagemakerfeaturestoreruntime/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/sagemakerfeaturestoreruntime/generated.json b/service/sagemakerfeaturestoreruntime/generated.json index af1d87a6539..a22b54496d7 100644 --- a/service/sagemakerfeaturestoreruntime/generated.json +++ b/service/sagemakerfeaturestoreruntime/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/sagemakerfeaturestoreruntime/go.mod b/service/sagemakerfeaturestoreruntime/go.mod index c86adb26882..993d64eb417 100644 --- a/service/sagemakerfeaturestoreruntime/go.mod +++ b/service/sagemakerfeaturestoreruntime/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sagemakerfeaturestoreruntime/go.sum b/service/sagemakerfeaturestoreruntime/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/sagemakerfeaturestoreruntime/go.sum +++ b/service/sagemakerfeaturestoreruntime/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/sagemakergeospatial/endpoints_test.go b/service/sagemakergeospatial/endpoints_test.go index 7b927c326e6..b2d5bfaed23 100644 --- a/service/sagemakergeospatial/endpoints_test.go +++ b/service/sagemakergeospatial/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/sagemakergeospatial/generated.json b/service/sagemakergeospatial/generated.json index 892d5345ae6..93c9b3a2c28 100644 --- a/service/sagemakergeospatial/generated.json +++ b/service/sagemakergeospatial/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/sagemakergeospatial/go.mod b/service/sagemakergeospatial/go.mod index 0d84e350ac0..80056760adb 100644 --- a/service/sagemakergeospatial/go.mod +++ b/service/sagemakergeospatial/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sagemakergeospatial/go.sum b/service/sagemakergeospatial/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/sagemakergeospatial/go.sum +++ b/service/sagemakergeospatial/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/sagemakermetrics/endpoints_test.go b/service/sagemakermetrics/endpoints_test.go index 3a64ebf78e7..bee676f722f 100644 --- a/service/sagemakermetrics/endpoints_test.go +++ b/service/sagemakermetrics/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/sagemakermetrics/generated.json b/service/sagemakermetrics/generated.json index 0791b5358f2..cf1907ea989 100644 --- a/service/sagemakermetrics/generated.json +++ b/service/sagemakermetrics/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/sagemakermetrics/go.mod b/service/sagemakermetrics/go.mod index fb632f1147c..b4d54e8054a 100644 --- a/service/sagemakermetrics/go.mod +++ b/service/sagemakermetrics/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sagemakermetrics/go.sum b/service/sagemakermetrics/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/sagemakermetrics/go.sum +++ b/service/sagemakermetrics/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/sagemakerruntime/endpoints_test.go b/service/sagemakerruntime/endpoints_test.go index ef997dfd594..8a1dbb36790 100644 --- a/service/sagemakerruntime/endpoints_test.go +++ b/service/sagemakerruntime/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1662,14 +1582,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1721,14 +1639,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1761,14 +1677,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/sagemakerruntime/generated.json b/service/sagemakerruntime/generated.json index 88649e83812..7629caecdf1 100644 --- a/service/sagemakerruntime/generated.json +++ b/service/sagemakerruntime/generated.json @@ -4,8 +4,7 @@ "github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/sagemakerruntime/go.mod b/service/sagemakerruntime/go.mod index c700ad983bb..a4c1387018a 100644 --- a/service/sagemakerruntime/go.mod +++ b/service/sagemakerruntime/go.mod @@ -8,7 +8,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sagemakerruntime/go.sum b/service/sagemakerruntime/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/sagemakerruntime/go.sum +++ b/service/sagemakerruntime/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/savingsplans/endpoints_test.go b/service/savingsplans/endpoints_test.go index bf4cafda862..93617b3ba6b 100644 --- a/service/savingsplans/endpoints_test.go +++ b/service/savingsplans/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -60,14 +60,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -99,14 +97,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -138,14 +134,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -177,14 +171,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -232,14 +224,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -271,14 +261,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -310,14 +298,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -349,14 +335,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -388,14 +372,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -427,14 +409,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -466,14 +446,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -505,14 +483,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -544,14 +520,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -603,14 +577,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -662,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -721,14 +691,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -780,14 +748,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -820,14 +786,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -859,14 +823,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/savingsplans/generated.json b/service/savingsplans/generated.json index 5886d672f4d..bbe04be534a 100644 --- a/service/savingsplans/generated.json +++ b/service/savingsplans/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/savingsplans/go.mod b/service/savingsplans/go.mod index b6d65d363fd..370b96a5cc3 100644 --- a/service/savingsplans/go.mod +++ b/service/savingsplans/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/savingsplans/go.sum b/service/savingsplans/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/savingsplans/go.sum +++ b/service/savingsplans/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/scheduler/endpoints_test.go b/service/scheduler/endpoints_test.go index fcedfd11942..70c6e7eb9a2 100644 --- a/service/scheduler/endpoints_test.go +++ b/service/scheduler/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/scheduler/generated.json b/service/scheduler/generated.json index 531df6e857c..29ac260c911 100644 --- a/service/scheduler/generated.json +++ b/service/scheduler/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/scheduler/go.mod b/service/scheduler/go.mod index 525a96322bf..999d1098820 100644 --- a/service/scheduler/go.mod +++ b/service/scheduler/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/scheduler/go.sum b/service/scheduler/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/scheduler/go.sum +++ b/service/scheduler/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/schemas/endpoints_test.go b/service/schemas/endpoints_test.go index f29f787585d..1bed9735d0e 100644 --- a/service/schemas/endpoints_test.go +++ b/service/schemas/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1154,14 +1098,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1213,14 +1155,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1272,14 +1212,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1331,14 +1269,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1410,14 +1344,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/schemas/generated.json b/service/schemas/generated.json index d8c9371c2de..8267a9da085 100644 --- a/service/schemas/generated.json +++ b/service/schemas/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/schemas/go.mod b/service/schemas/go.mod index 17ed140fd25..972064e04f4 100644 --- a/service/schemas/go.mod +++ b/service/schemas/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/schemas/go.sum b/service/schemas/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/schemas/go.sum +++ b/service/schemas/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/secretsmanager/endpoints_test.go b/service/secretsmanager/endpoints_test.go index a678ecf3400..9cbba4a26aa 100644 --- a/service/secretsmanager/endpoints_test.go +++ b/service/secretsmanager/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1740,14 +1656,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1799,14 +1713,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/secretsmanager/generated.json b/service/secretsmanager/generated.json index da090ebda8e..b64ce162375 100644 --- a/service/secretsmanager/generated.json +++ b/service/secretsmanager/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/secretsmanager/go.mod b/service/secretsmanager/go.mod index 7cfc4e97027..7a9c19dbe7c 100644 --- a/service/secretsmanager/go.mod +++ b/service/secretsmanager/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/secretsmanager/go.sum b/service/secretsmanager/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/secretsmanager/go.sum +++ b/service/secretsmanager/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/securityhub/endpoints_test.go b/service/securityhub/endpoints_test.go index 259f507f819..5807f98e1c1 100644 --- a/service/securityhub/endpoints_test.go +++ b/service/securityhub/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1642,14 +1562,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1701,14 +1619,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1760,14 +1676,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/securityhub/generated.json b/service/securityhub/generated.json index 2a764c6228e..8f89af3cd26 100644 --- a/service/securityhub/generated.json +++ b/service/securityhub/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/securityhub/go.mod b/service/securityhub/go.mod index 24c1871fd46..3f6425677dc 100644 --- a/service/securityhub/go.mod +++ b/service/securityhub/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/securityhub/go.sum b/service/securityhub/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/securityhub/go.sum +++ b/service/securityhub/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/securitylake/endpoints_test.go b/service/securitylake/endpoints_test.go index 387584add72..a1ccdce8a65 100644 --- a/service/securitylake/endpoints_test.go +++ b/service/securitylake/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/securitylake/generated.json b/service/securitylake/generated.json index b75e840a9fa..2ba0041735e 100644 --- a/service/securitylake/generated.json +++ b/service/securitylake/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/securitylake/go.mod b/service/securitylake/go.mod index 000b67d5274..87a3bc7e100 100644 --- a/service/securitylake/go.mod +++ b/service/securitylake/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/securitylake/go.sum b/service/securitylake/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/securitylake/go.sum +++ b/service/securitylake/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/serverlessapplicationrepository/endpoints_test.go b/service/serverlessapplicationrepository/endpoints_test.go index cb9610ea2d1..91771ccd36f 100644 --- a/service/serverlessapplicationrepository/endpoints_test.go +++ b/service/serverlessapplicationrepository/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1310,14 +1246,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1369,14 +1303,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1428,14 +1360,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1487,14 +1417,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1527,14 +1455,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/serverlessapplicationrepository/generated.json b/service/serverlessapplicationrepository/generated.json index 905afdacec2..d85c72dca26 100644 --- a/service/serverlessapplicationrepository/generated.json +++ b/service/serverlessapplicationrepository/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/serverlessapplicationrepository/go.mod b/service/serverlessapplicationrepository/go.mod index 316f2a413ce..bd1972d9e88 100644 --- a/service/serverlessapplicationrepository/go.mod +++ b/service/serverlessapplicationrepository/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/serverlessapplicationrepository/go.sum b/service/serverlessapplicationrepository/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/serverlessapplicationrepository/go.sum +++ b/service/serverlessapplicationrepository/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/servicecatalog/endpoints_test.go b/service/servicecatalog/endpoints_test.go index da0f1e5a46d..be3ac70b8ef 100644 --- a/service/servicecatalog/endpoints_test.go +++ b/service/servicecatalog/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1642,14 +1562,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1701,14 +1619,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1760,14 +1676,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/servicecatalog/generated.json b/service/servicecatalog/generated.json index a998eed3c13..a0428e633ba 100644 --- a/service/servicecatalog/generated.json +++ b/service/servicecatalog/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/servicecatalog/go.mod b/service/servicecatalog/go.mod index 82249253ba4..c45f2dc3c73 100644 --- a/service/servicecatalog/go.mod +++ b/service/servicecatalog/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/servicecatalog/go.sum b/service/servicecatalog/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/servicecatalog/go.sum +++ b/service/servicecatalog/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/servicecatalogappregistry/endpoints_test.go b/service/servicecatalogappregistry/endpoints_test.go index c0a0a2d4af4..34c30be6eb7 100644 --- a/service/servicecatalogappregistry/endpoints_test.go +++ b/service/servicecatalogappregistry/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1544,14 +1468,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1603,14 +1525,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1662,14 +1582,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1721,14 +1639,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1761,14 +1677,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/servicecatalogappregistry/generated.json b/service/servicecatalogappregistry/generated.json index ba12579d9de..d3db71e295a 100644 --- a/service/servicecatalogappregistry/generated.json +++ b/service/servicecatalogappregistry/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/servicecatalogappregistry/go.mod b/service/servicecatalogappregistry/go.mod index 16a80cafa06..c272ff2bc3d 100644 --- a/service/servicecatalogappregistry/go.mod +++ b/service/servicecatalogappregistry/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/servicecatalogappregistry/go.sum b/service/servicecatalogappregistry/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/servicecatalogappregistry/go.sum +++ b/service/servicecatalogappregistry/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/servicediscovery/endpoints_test.go b/service/servicediscovery/endpoints_test.go index 4f1f20608bb..dc8b8f95cb5 100644 --- a/service/servicediscovery/endpoints_test.go +++ b/service/servicediscovery/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1544,14 +1468,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1603,14 +1525,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1662,14 +1582,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1721,14 +1639,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1761,14 +1677,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/servicediscovery/generated.json b/service/servicediscovery/generated.json index 9a4d3913afc..c9892de7d45 100644 --- a/service/servicediscovery/generated.json +++ b/service/servicediscovery/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/servicediscovery/go.mod b/service/servicediscovery/go.mod index e5bcb225b41..8fd6fd99ae7 100644 --- a/service/servicediscovery/go.mod +++ b/service/servicediscovery/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/servicediscovery/go.sum b/service/servicediscovery/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/servicediscovery/go.sum +++ b/service/servicediscovery/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/servicequotas/endpoints_test.go b/service/servicequotas/endpoints_test.go index 35b69f9eb0c..ca79e09dfb0 100644 --- a/service/servicequotas/endpoints_test.go +++ b/service/servicequotas/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1427,14 +1357,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1486,14 +1414,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1545,14 +1471,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1604,14 +1528,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1683,14 +1603,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/servicequotas/generated.json b/service/servicequotas/generated.json index 8dd039df7b4..3476560db38 100644 --- a/service/servicequotas/generated.json +++ b/service/servicequotas/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/servicequotas/go.mod b/service/servicequotas/go.mod index e0f764a091c..c2a1e19acf9 100644 --- a/service/servicequotas/go.mod +++ b/service/servicequotas/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/servicequotas/go.sum b/service/servicequotas/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/servicequotas/go.sum +++ b/service/servicequotas/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/ses/endpoints_test.go b/service/ses/endpoints_test.go index 14256baa4bf..8b116219161 100644 --- a/service/ses/endpoints_test.go +++ b/service/ses/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1388,14 +1320,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1447,14 +1377,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1506,14 +1434,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1565,14 +1491,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1605,14 +1529,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ses/generated.json b/service/ses/generated.json index 364e6080e5c..4da1ae6620e 100644 --- a/service/ses/generated.json +++ b/service/ses/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/ses/go.mod b/service/ses/go.mod index 8d0b31cd0c0..c7dcef41e02 100644 --- a/service/ses/go.mod +++ b/service/ses/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/ses/go.sum b/service/ses/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/ses/go.sum +++ b/service/ses/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/sesv2/endpoints_test.go b/service/sesv2/endpoints_test.go index b90a6c86a48..8d5dd6134a4 100644 --- a/service/sesv2/endpoints_test.go +++ b/service/sesv2/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1388,14 +1320,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1447,14 +1377,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1506,14 +1434,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1565,14 +1491,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1605,14 +1529,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1644,14 +1566,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/sesv2/generated.json b/service/sesv2/generated.json index 21fd0da2717..ebfaec9a292 100644 --- a/service/sesv2/generated.json +++ b/service/sesv2/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/sesv2/go.mod b/service/sesv2/go.mod index 045bbd9efe4..1264d162e85 100644 --- a/service/sesv2/go.mod +++ b/service/sesv2/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sesv2/go.sum b/service/sesv2/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/sesv2/go.sum +++ b/service/sesv2/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/sfn/endpoints_test.go b/service/sfn/endpoints_test.go index 66861da2d1a..c684eb2ccc3 100644 --- a/service/sfn/endpoints_test.go +++ b/service/sfn/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/sfn/generated.json b/service/sfn/generated.json index df4f55c8469..5273f2049f2 100644 --- a/service/sfn/generated.json +++ b/service/sfn/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/sfn/go.mod b/service/sfn/go.mod index 7a236cc7e83..9bd39309bac 100644 --- a/service/sfn/go.mod +++ b/service/sfn/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sfn/go.sum b/service/sfn/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/sfn/go.sum +++ b/service/sfn/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/shield/endpoints_test.go b/service/shield/endpoints_test.go index c3d18784016..5f77d8c3372 100644 --- a/service/shield/endpoints_test.go +++ b/service/shield/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -60,14 +60,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -115,14 +113,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -154,14 +150,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -209,14 +203,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -248,14 +240,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -303,14 +293,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -342,14 +330,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -381,14 +367,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -420,14 +404,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -459,14 +441,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -498,14 +478,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -537,14 +515,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -576,14 +552,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -615,14 +589,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -674,14 +646,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -733,14 +703,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -792,14 +760,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -851,14 +817,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -891,14 +855,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -930,14 +892,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/shield/generated.json b/service/shield/generated.json index 7ed4c9da4eb..159d289fa6f 100644 --- a/service/shield/generated.json +++ b/service/shield/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/shield/go.mod b/service/shield/go.mod index 92618e64731..37a73ef103e 100644 --- a/service/shield/go.mod +++ b/service/shield/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/shield/go.sum b/service/shield/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/shield/go.sum +++ b/service/shield/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/signer/endpoints_test.go b/service/signer/endpoints_test.go index 052ce9aba2d..6d970c2c4e1 100644 --- a/service/signer/endpoints_test.go +++ b/service/signer/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/signer/generated.json b/service/signer/generated.json index 4a1221778f9..60c17a38a26 100644 --- a/service/signer/generated.json +++ b/service/signer/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/signer/go.mod b/service/signer/go.mod index 3efe73bdf81..957a3a50e54 100644 --- a/service/signer/go.mod +++ b/service/signer/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/signer/go.sum b/service/signer/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/signer/go.sum +++ b/service/signer/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/simspaceweaver/endpoints_test.go b/service/simspaceweaver/endpoints_test.go index ddd1391b5d5..14ee3082b4a 100644 --- a/service/simspaceweaver/endpoints_test.go +++ b/service/simspaceweaver/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/simspaceweaver/generated.json b/service/simspaceweaver/generated.json index a499b74b144..43bbdc9a754 100644 --- a/service/simspaceweaver/generated.json +++ b/service/simspaceweaver/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/simspaceweaver/go.mod b/service/simspaceweaver/go.mod index ebdac951060..7a428edd26f 100644 --- a/service/simspaceweaver/go.mod +++ b/service/simspaceweaver/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/simspaceweaver/go.sum b/service/simspaceweaver/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/simspaceweaver/go.sum +++ b/service/simspaceweaver/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/sms/endpoints_test.go b/service/sms/endpoints_test.go index 5945fc6f2b6..cd39d9a0ce2 100644 --- a/service/sms/endpoints_test.go +++ b/service/sms/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1505,14 +1431,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1564,14 +1488,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1623,14 +1545,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1682,14 +1602,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1722,14 +1640,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1761,14 +1677,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/sms/generated.json b/service/sms/generated.json index 8088aeee179..2e1ad00d534 100644 --- a/service/sms/generated.json +++ b/service/sms/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/sms/go.mod b/service/sms/go.mod index f257739d9c7..2f1ab473119 100644 --- a/service/sms/go.mod +++ b/service/sms/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sms/go.sum b/service/sms/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/sms/go.sum +++ b/service/sms/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/snowball/endpoints_test.go b/service/snowball/endpoints_test.go index ceba90bc9a8..e6b0ad32c56 100644 --- a/service/snowball/endpoints_test.go +++ b/service/snowball/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1641,14 +1559,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1680,14 +1596,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1719,14 +1633,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1758,14 +1670,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1797,14 +1707,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1836,14 +1744,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1875,14 +1781,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1914,14 +1818,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1953,14 +1855,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1992,14 +1892,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2051,14 +1949,12 @@ func TestEndpointCase52(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2110,14 +2006,12 @@ func TestEndpointCase54(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2169,14 +2063,12 @@ func TestEndpointCase56(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2229,14 +2121,12 @@ func TestEndpointCase58(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2268,14 +2158,12 @@ func TestEndpointCase59(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/snowball/generated.json b/service/snowball/generated.json index e8a8e1d9d2d..fa21e25306c 100644 --- a/service/snowball/generated.json +++ b/service/snowball/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/snowball/go.mod b/service/snowball/go.mod index 93cbed0c0fb..ee05e7e93d5 100644 --- a/service/snowball/go.mod +++ b/service/snowball/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/snowball/go.sum b/service/snowball/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/snowball/go.sum +++ b/service/snowball/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/snowdevicemanagement/endpoints_test.go b/service/snowdevicemanagement/endpoints_test.go index 06acce79c98..4f5dc3e6468 100644 --- a/service/snowdevicemanagement/endpoints_test.go +++ b/service/snowdevicemanagement/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/snowdevicemanagement/generated.json b/service/snowdevicemanagement/generated.json index cc4ddb645df..f657860343e 100644 --- a/service/snowdevicemanagement/generated.json +++ b/service/snowdevicemanagement/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/snowdevicemanagement/go.mod b/service/snowdevicemanagement/go.mod index 90a6cd81f92..966f3b2d6fe 100644 --- a/service/snowdevicemanagement/go.mod +++ b/service/snowdevicemanagement/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/snowdevicemanagement/go.sum b/service/snowdevicemanagement/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/snowdevicemanagement/go.sum +++ b/service/snowdevicemanagement/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/sns/endpoints_test.go b/service/sns/endpoints_test.go index f2f02b363e5..bc0a6f74d44 100644 --- a/service/sns/endpoints_test.go +++ b/service/sns/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/sns/generated.json b/service/sns/generated.json index 3dccedd4a82..3c5f3afa44a 100644 --- a/service/sns/generated.json +++ b/service/sns/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/sns/go.mod b/service/sns/go.mod index 8044adbf22a..40280c71540 100644 --- a/service/sns/go.mod +++ b/service/sns/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sns/go.sum b/service/sns/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/sns/go.sum +++ b/service/sns/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/sqs/endpoints_test.go b/service/sqs/endpoints_test.go index fe7df1c86ff..04adf7adf92 100644 --- a/service/sqs/endpoints_test.go +++ b/service/sqs/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1622,14 +1542,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1681,14 +1599,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1740,14 +1656,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/sqs/generated.json b/service/sqs/generated.json index a25a5d26d46..9e150ddee5b 100644 --- a/service/sqs/generated.json +++ b/service/sqs/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/sqs/go.mod b/service/sqs/go.mod index ac2cd0ae192..1b8210f79ae 100644 --- a/service/sqs/go.mod +++ b/service/sqs/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sqs/go.sum b/service/sqs/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/sqs/go.sum +++ b/service/sqs/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/ssm/endpoints_test.go b/service/ssm/endpoints_test.go index 2188057e568..4dc18d5b7e7 100644 --- a/service/ssm/endpoints_test.go +++ b/service/ssm/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ssm/generated.json b/service/ssm/generated.json index a0afef9050f..1bc036ac46d 100644 --- a/service/ssm/generated.json +++ b/service/ssm/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/ssm/go.mod b/service/ssm/go.mod index 8e67fbfc1f4..b1805b039e2 100644 --- a/service/ssm/go.mod +++ b/service/ssm/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/ssm/go.sum b/service/ssm/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/ssm/go.sum +++ b/service/ssm/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/ssmcontacts/endpoints_test.go b/service/ssmcontacts/endpoints_test.go index f0597367af9..22d635c81e0 100644 --- a/service/ssmcontacts/endpoints_test.go +++ b/service/ssmcontacts/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ssmcontacts/generated.json b/service/ssmcontacts/generated.json index ba3a19705b9..41b233c6c95 100644 --- a/service/ssmcontacts/generated.json +++ b/service/ssmcontacts/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/ssmcontacts/go.mod b/service/ssmcontacts/go.mod index 971fa135d02..57d9af68a5d 100644 --- a/service/ssmcontacts/go.mod +++ b/service/ssmcontacts/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ssmcontacts/go.sum b/service/ssmcontacts/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/ssmcontacts/go.sum +++ b/service/ssmcontacts/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/ssmincidents/endpoints_test.go b/service/ssmincidents/endpoints_test.go index 4b1abf89ffb..5ab02eaf43c 100644 --- a/service/ssmincidents/endpoints_test.go +++ b/service/ssmincidents/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1115,14 +1061,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1174,14 +1118,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1233,14 +1175,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1292,14 +1232,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ssmincidents/generated.json b/service/ssmincidents/generated.json index 69d475a11ae..9176e6686df 100644 --- a/service/ssmincidents/generated.json +++ b/service/ssmincidents/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/ssmincidents/go.mod b/service/ssmincidents/go.mod index 4bd141109b0..70b2b75fed4 100644 --- a/service/ssmincidents/go.mod +++ b/service/ssmincidents/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/ssmincidents/go.sum b/service/ssmincidents/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/ssmincidents/go.sum +++ b/service/ssmincidents/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/ssmsap/endpoints_test.go b/service/ssmsap/endpoints_test.go index 8871f6b85e2..9f1e11ef499 100644 --- a/service/ssmsap/endpoints_test.go +++ b/service/ssmsap/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ssmsap/generated.json b/service/ssmsap/generated.json index afc2f0f8379..fca15fc1ac7 100644 --- a/service/ssmsap/generated.json +++ b/service/ssmsap/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/ssmsap/go.mod b/service/ssmsap/go.mod index a274316b02a..f93970da466 100644 --- a/service/ssmsap/go.mod +++ b/service/ssmsap/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ssmsap/go.sum b/service/ssmsap/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/ssmsap/go.sum +++ b/service/ssmsap/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/sso/endpoints_test.go b/service/sso/endpoints_test.go index 9ffa291ace2..d06449037d4 100644 --- a/service/sso/endpoints_test.go +++ b/service/sso/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1271,14 +1209,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1330,14 +1266,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1389,14 +1323,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1448,14 +1380,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1488,14 +1418,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1527,14 +1455,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/sso/generated.json b/service/sso/generated.json index 62aba0d0552..936253d7cae 100644 --- a/service/sso/generated.json +++ b/service/sso/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/sso/go.mod b/service/sso/go.mod index 4a0e933c84e..83a0eed9dd3 100644 --- a/service/sso/go.mod +++ b/service/sso/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sso/go.sum b/service/sso/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/sso/go.sum +++ b/service/sso/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/ssoadmin/endpoints_test.go b/service/ssoadmin/endpoints_test.go index 197ba56a109..2d4ad1e7e37 100644 --- a/service/ssoadmin/endpoints_test.go +++ b/service/ssoadmin/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1310,14 +1246,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1369,14 +1303,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1428,14 +1360,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1487,14 +1417,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1527,14 +1455,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1566,14 +1492,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ssoadmin/generated.json b/service/ssoadmin/generated.json index 68b94908f30..f82f5400185 100644 --- a/service/ssoadmin/generated.json +++ b/service/ssoadmin/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/ssoadmin/go.mod b/service/ssoadmin/go.mod index eacdce4b5db..051251f642d 100644 --- a/service/ssoadmin/go.mod +++ b/service/ssoadmin/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ssoadmin/go.sum b/service/ssoadmin/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/ssoadmin/go.sum +++ b/service/ssoadmin/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/ssooidc/endpoints_test.go b/service/ssooidc/endpoints_test.go index 7c527d2760a..e07b25ca302 100644 --- a/service/ssooidc/endpoints_test.go +++ b/service/ssooidc/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1271,14 +1209,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1330,14 +1266,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1389,14 +1323,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1448,14 +1380,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1488,14 +1418,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1527,14 +1455,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/ssooidc/generated.json b/service/ssooidc/generated.json index 62007829b60..b2a52633ba6 100644 --- a/service/ssooidc/generated.json +++ b/service/ssooidc/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/ssooidc/go.mod b/service/ssooidc/go.mod index 7fa9ba41ad6..d2a1da98a42 100644 --- a/service/ssooidc/go.mod +++ b/service/ssooidc/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ssooidc/go.sum b/service/ssooidc/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/ssooidc/go.sum +++ b/service/ssooidc/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/storagegateway/endpoints_test.go b/service/storagegateway/endpoints_test.go index 7faef9fa217..0ac99b02c30 100644 --- a/service/storagegateway/endpoints_test.go +++ b/service/storagegateway/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1622,14 +1542,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1681,14 +1599,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1740,14 +1656,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1799,14 +1713,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/storagegateway/generated.json b/service/storagegateway/generated.json index a5db62c96ba..d1931341225 100644 --- a/service/storagegateway/generated.json +++ b/service/storagegateway/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/storagegateway/go.mod b/service/storagegateway/go.mod index a4d173e7f83..3a481c5201b 100644 --- a/service/storagegateway/go.mod +++ b/service/storagegateway/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/storagegateway/go.sum b/service/storagegateway/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/storagegateway/go.sum +++ b/service/storagegateway/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/sts/endpoints_test.go b/service/sts/endpoints_test.go index 5d19443a621..eb2f1d4c56e 100644 --- a/service/sts/endpoints_test.go +++ b/service/sts/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -44,14 +44,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -83,14 +81,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -122,14 +118,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -161,14 +155,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -200,14 +192,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -239,14 +229,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -278,14 +266,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -317,14 +303,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -356,14 +340,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -411,14 +393,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -450,14 +430,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -489,14 +467,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -528,14 +504,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -567,14 +541,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -606,14 +578,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -645,14 +615,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -684,14 +652,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -723,14 +689,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -762,14 +726,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -801,14 +763,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -840,14 +800,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -879,14 +837,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -918,14 +874,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -957,14 +911,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -996,14 +948,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1035,14 +985,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1074,14 +1022,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1113,14 +1059,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1152,14 +1096,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1191,14 +1133,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1230,14 +1170,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1269,14 +1207,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1308,14 +1244,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1347,14 +1281,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1386,14 +1318,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1425,14 +1355,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1464,14 +1392,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1503,14 +1429,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1542,14 +1466,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1581,14 +1503,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1620,14 +1540,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1659,14 +1577,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1718,14 +1634,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1777,14 +1691,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1836,14 +1748,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1896,14 +1806,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1935,14 +1843,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2049,14 +1955,12 @@ func TestEndpointCase54(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2105,14 +2009,12 @@ func TestEndpointCase55(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2161,14 +2063,12 @@ func TestEndpointCase56(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2217,14 +2117,12 @@ func TestEndpointCase57(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2273,14 +2171,12 @@ func TestEndpointCase58(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2329,14 +2225,12 @@ func TestEndpointCase59(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2385,14 +2279,12 @@ func TestEndpointCase60(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2441,14 +2333,12 @@ func TestEndpointCase61(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2497,14 +2387,12 @@ func TestEndpointCase62(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2553,14 +2441,12 @@ func TestEndpointCase63(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2609,14 +2495,12 @@ func TestEndpointCase64(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2665,14 +2549,12 @@ func TestEndpointCase65(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2721,14 +2603,12 @@ func TestEndpointCase66(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2777,14 +2657,12 @@ func TestEndpointCase67(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2833,14 +2711,12 @@ func TestEndpointCase68(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2889,14 +2765,12 @@ func TestEndpointCase69(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2945,14 +2819,12 @@ func TestEndpointCase70(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2986,14 +2858,12 @@ func TestEndpointCase71(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -3026,13 +2896,11 @@ func TestEndpointCase72(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/sts/generated.json b/service/sts/generated.json index 54fac4bd5b7..6b6e839e6c9 100644 --- a/service/sts/generated.json +++ b/service/sts/generated.json @@ -5,8 +5,7 @@ "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding": "v1.0.5", "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url": "v1.0.7", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/sts/go.mod b/service/sts/go.mod index f06dac7254c..385203300de 100644 --- a/service/sts/go.mod +++ b/service/sts/go.mod @@ -9,7 +9,6 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.4 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sts/go.sum b/service/sts/go.sum index 35ac695fb99..d5d61042cef 100644 --- a/service/sts/go.sum +++ b/service/sts/go.sum @@ -1,4 +1,3 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/supplychain/endpoints_test.go b/service/supplychain/endpoints_test.go index 81551b6356e..7307e6e4eeb 100644 --- a/service/supplychain/endpoints_test.go +++ b/service/supplychain/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/supplychain/generated.json b/service/supplychain/generated.json index 3ab7ad7024f..ab6375098bb 100644 --- a/service/supplychain/generated.json +++ b/service/supplychain/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/supplychain/go.mod b/service/supplychain/go.mod index 23086d30852..a3a483cd35b 100644 --- a/service/supplychain/go.mod +++ b/service/supplychain/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/supplychain/go.sum b/service/supplychain/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/supplychain/go.sum +++ b/service/supplychain/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/support/endpoints_test.go b/service/support/endpoints_test.go index e67020de841..c93e6bcc58a 100644 --- a/service/support/endpoints_test.go +++ b/service/support/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -60,14 +60,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -99,14 +97,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -138,14 +134,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -177,14 +171,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -232,14 +224,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -287,14 +277,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -326,14 +314,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -365,14 +351,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -404,14 +388,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -459,14 +441,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -514,14 +494,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -553,14 +531,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -592,14 +568,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -631,14 +605,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -686,14 +658,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -741,14 +711,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -800,14 +768,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -875,14 +841,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -930,14 +894,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -989,14 +951,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1064,14 +1024,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1104,14 +1062,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1143,14 +1099,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/support/generated.json b/service/support/generated.json index 846023d3286..c587da68d7c 100644 --- a/service/support/generated.json +++ b/service/support/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/support/go.mod b/service/support/go.mod index bc95126ddd2..0666c9648ae 100644 --- a/service/support/go.mod +++ b/service/support/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/support/go.sum b/service/support/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/support/go.sum +++ b/service/support/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/supportapp/endpoints_test.go b/service/supportapp/endpoints_test.go index 793dc8e39b3..dfa5991c0aa 100644 --- a/service/supportapp/endpoints_test.go +++ b/service/supportapp/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/supportapp/generated.json b/service/supportapp/generated.json index 5e82a2240a6..be7311f28a5 100644 --- a/service/supportapp/generated.json +++ b/service/supportapp/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/supportapp/go.mod b/service/supportapp/go.mod index 76684e87c84..742d293c6cc 100644 --- a/service/supportapp/go.mod +++ b/service/supportapp/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/supportapp/go.sum b/service/supportapp/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/supportapp/go.sum +++ b/service/supportapp/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/swf/endpoints_test.go b/service/swf/endpoints_test.go index 003a5ce2805..d91661b6f01 100644 --- a/service/swf/endpoints_test.go +++ b/service/swf/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1661,14 +1579,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1720,14 +1636,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1779,14 +1693,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1878,14 +1788,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/swf/generated.json b/service/swf/generated.json index 67eaecc0f99..5aa623b9061 100644 --- a/service/swf/generated.json +++ b/service/swf/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/swf/go.mod b/service/swf/go.mod index 6bd5e91ab38..c5a37e6b9c6 100644 --- a/service/swf/go.mod +++ b/service/swf/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/swf/go.sum b/service/swf/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/swf/go.sum +++ b/service/swf/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/synthetics/endpoints_test.go b/service/synthetics/endpoints_test.go index 58de6382021..e9bf30c6fc9 100644 --- a/service/synthetics/endpoints_test.go +++ b/service/synthetics/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1622,14 +1542,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1681,14 +1599,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1740,14 +1656,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/synthetics/generated.json b/service/synthetics/generated.json index 60f3513799a..207ec3b16f7 100644 --- a/service/synthetics/generated.json +++ b/service/synthetics/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/synthetics/go.mod b/service/synthetics/go.mod index 98272fd7283..918ac22c086 100644 --- a/service/synthetics/go.mod +++ b/service/synthetics/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/synthetics/go.sum b/service/synthetics/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/synthetics/go.sum +++ b/service/synthetics/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/textract/endpoints_test.go b/service/textract/endpoints_test.go index d217e0a5978..68dbfa7afbb 100644 --- a/service/textract/endpoints_test.go +++ b/service/textract/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1232,14 +1172,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1291,14 +1229,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1350,14 +1286,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1409,14 +1343,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1449,14 +1381,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1488,14 +1418,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/textract/generated.json b/service/textract/generated.json index f87d044078f..46703ecd632 100644 --- a/service/textract/generated.json +++ b/service/textract/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/textract/go.mod b/service/textract/go.mod index 1ee2e81fc9f..67535614aef 100644 --- a/service/textract/go.mod +++ b/service/textract/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/textract/go.sum b/service/textract/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/textract/go.sum +++ b/service/textract/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/timestreamquery/endpoints_test.go b/service/timestreamquery/endpoints_test.go index fe5b8624838..7bc474d48e0 100644 --- a/service/timestreamquery/endpoints_test.go +++ b/service/timestreamquery/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/timestreamquery/generated.json b/service/timestreamquery/generated.json index a5c56c0fedd..3cfff7df12b 100644 --- a/service/timestreamquery/generated.json +++ b/service/timestreamquery/generated.json @@ -4,8 +4,7 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery": "v0.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/timestreamquery/go.mod b/service/timestreamquery/go.mod index 53eae6ec4f0..c1c6af3a0f3 100644 --- a/service/timestreamquery/go.mod +++ b/service/timestreamquery/go.mod @@ -8,7 +8,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.3 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/timestreamquery/go.sum b/service/timestreamquery/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/timestreamquery/go.sum +++ b/service/timestreamquery/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/timestreamwrite/endpoints_test.go b/service/timestreamwrite/endpoints_test.go index f90ec174296..2e5bdbc275d 100644 --- a/service/timestreamwrite/endpoints_test.go +++ b/service/timestreamwrite/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -608,14 +580,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -667,14 +637,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -726,14 +694,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -785,14 +751,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -864,14 +826,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/timestreamwrite/generated.json b/service/timestreamwrite/generated.json index 62fd7c69651..833c5f8d0d3 100644 --- a/service/timestreamwrite/generated.json +++ b/service/timestreamwrite/generated.json @@ -4,8 +4,7 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery": "v0.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/timestreamwrite/go.mod b/service/timestreamwrite/go.mod index 8fac170ea58..189200d036d 100644 --- a/service/timestreamwrite/go.mod +++ b/service/timestreamwrite/go.mod @@ -8,7 +8,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.3 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/timestreamwrite/go.sum b/service/timestreamwrite/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/timestreamwrite/go.sum +++ b/service/timestreamwrite/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/tnb/endpoints_test.go b/service/tnb/endpoints_test.go index f5fbf0d4696..4093974150b 100644 --- a/service/tnb/endpoints_test.go +++ b/service/tnb/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/tnb/generated.json b/service/tnb/generated.json index 2147aed8a16..23e295c65c8 100644 --- a/service/tnb/generated.json +++ b/service/tnb/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/tnb/go.mod b/service/tnb/go.mod index bd6c8fb9441..b945748afa6 100644 --- a/service/tnb/go.mod +++ b/service/tnb/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/tnb/go.sum b/service/tnb/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/tnb/go.sum +++ b/service/tnb/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/transcribe/endpoints_test.go b/service/transcribe/endpoints_test.go index 8fd4e12f329..e755126083d 100644 --- a/service/transcribe/endpoints_test.go +++ b/service/transcribe/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1544,14 +1468,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1623,14 +1545,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1682,14 +1602,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1722,14 +1640,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1761,14 +1677,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/transcribe/generated.json b/service/transcribe/generated.json index d0c412fbf49..d0c754c1dd5 100644 --- a/service/transcribe/generated.json +++ b/service/transcribe/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/transcribe/go.mod b/service/transcribe/go.mod index c95f790c632..881fe369d26 100644 --- a/service/transcribe/go.mod +++ b/service/transcribe/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/transcribe/go.sum b/service/transcribe/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/transcribe/go.sum +++ b/service/transcribe/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/transcribestreaming/endpoints_test.go b/service/transcribestreaming/endpoints_test.go index 6adba2bce19..8c60402d995 100644 --- a/service/transcribestreaming/endpoints_test.go +++ b/service/transcribestreaming/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1037,14 +987,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1116,14 +1064,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1175,14 +1121,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1215,14 +1159,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1254,14 +1196,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/transcribestreaming/generated.json b/service/transcribestreaming/generated.json index 6ce6df05ee9..2632aa2b411 100644 --- a/service/transcribestreaming/generated.json +++ b/service/transcribestreaming/generated.json @@ -4,8 +4,7 @@ "github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/transcribestreaming/go.mod b/service/transcribestreaming/go.mod index 1e0c67e7e2d..bdb3d10413c 100644 --- a/service/transcribestreaming/go.mod +++ b/service/transcribestreaming/go.mod @@ -8,7 +8,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/transcribestreaming/go.sum b/service/transcribestreaming/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/transcribestreaming/go.sum +++ b/service/transcribestreaming/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/transfer/endpoints_test.go b/service/transfer/endpoints_test.go index 0414d98b15a..20995528ae7 100644 --- a/service/transfer/endpoints_test.go +++ b/service/transfer/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1642,14 +1562,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1701,14 +1619,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1760,14 +1676,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/transfer/generated.json b/service/transfer/generated.json index 8cdf74919ee..e52704e957a 100644 --- a/service/transfer/generated.json +++ b/service/transfer/generated.json @@ -4,7 +4,6 @@ "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4", "github.com/jmespath/go-jmespath": "v0.4.0" }, "files": [ diff --git a/service/transfer/go.mod b/service/transfer/go.mod index 36e50966aa8..8f792830adb 100644 --- a/service/transfer/go.mod +++ b/service/transfer/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/transfer/go.sum b/service/transfer/go.sum index 373314e89bc..63f954b78d9 100644 --- a/service/transfer/go.sum +++ b/service/transfer/go.sum @@ -2,8 +2,6 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/service/translate/endpoints_test.go b/service/translate/endpoints_test.go index db729b9818a..a603a7859d4 100644 --- a/service/translate/endpoints_test.go +++ b/service/translate/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1310,14 +1246,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1389,14 +1323,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1448,14 +1380,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1488,14 +1418,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1527,14 +1455,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/translate/generated.json b/service/translate/generated.json index 8f6673063f6..ab59492f039 100644 --- a/service/translate/generated.json +++ b/service/translate/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/translate/go.mod b/service/translate/go.mod index c56bb161967..94a8f4d51f5 100644 --- a/service/translate/go.mod +++ b/service/translate/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/translate/go.sum b/service/translate/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/translate/go.sum +++ b/service/translate/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/trustedadvisor/endpoints_test.go b/service/trustedadvisor/endpoints_test.go index a8bcb5f2e04..0288bca2189 100644 --- a/service/trustedadvisor/endpoints_test.go +++ b/service/trustedadvisor/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/trustedadvisor/generated.json b/service/trustedadvisor/generated.json index 4cc51b0ccac..f91d0363017 100644 --- a/service/trustedadvisor/generated.json +++ b/service/trustedadvisor/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/trustedadvisor/go.mod b/service/trustedadvisor/go.mod index ef7a198035d..5077e5f6473 100644 --- a/service/trustedadvisor/go.mod +++ b/service/trustedadvisor/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/trustedadvisor/go.sum b/service/trustedadvisor/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/trustedadvisor/go.sum +++ b/service/trustedadvisor/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/verifiedpermissions/endpoints_test.go b/service/verifiedpermissions/endpoints_test.go index 0ca4258862b..e580c76609c 100644 --- a/service/verifiedpermissions/endpoints_test.go +++ b/service/verifiedpermissions/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/verifiedpermissions/generated.json b/service/verifiedpermissions/generated.json index 45f3542a178..9969feddb6a 100644 --- a/service/verifiedpermissions/generated.json +++ b/service/verifiedpermissions/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/verifiedpermissions/go.mod b/service/verifiedpermissions/go.mod index ca93b7768ff..64ec57fdeb1 100644 --- a/service/verifiedpermissions/go.mod +++ b/service/verifiedpermissions/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/verifiedpermissions/go.sum b/service/verifiedpermissions/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/verifiedpermissions/go.sum +++ b/service/verifiedpermissions/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/voiceid/endpoints_test.go b/service/voiceid/endpoints_test.go index 32903fd25bb..d241584f2da 100644 --- a/service/voiceid/endpoints_test.go +++ b/service/voiceid/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -764,14 +728,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -823,14 +785,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -882,14 +842,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -941,14 +899,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1020,14 +974,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/voiceid/generated.json b/service/voiceid/generated.json index b30e84e7f0a..db8341ff542 100644 --- a/service/voiceid/generated.json +++ b/service/voiceid/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/voiceid/go.mod b/service/voiceid/go.mod index ded375a81f8..69698bdce4d 100644 --- a/service/voiceid/go.mod +++ b/service/voiceid/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/voiceid/go.sum b/service/voiceid/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/voiceid/go.sum +++ b/service/voiceid/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/vpclattice/endpoints_test.go b/service/vpclattice/endpoints_test.go index 1ae9f928bba..cbe9b86441a 100644 --- a/service/vpclattice/endpoints_test.go +++ b/service/vpclattice/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/vpclattice/generated.json b/service/vpclattice/generated.json index cad67b35800..7eea25ed9aa 100644 --- a/service/vpclattice/generated.json +++ b/service/vpclattice/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/vpclattice/go.mod b/service/vpclattice/go.mod index 9407121f63f..2a96e59fc25 100644 --- a/service/vpclattice/go.mod +++ b/service/vpclattice/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/vpclattice/go.sum b/service/vpclattice/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/vpclattice/go.sum +++ b/service/vpclattice/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/waf/endpoints_test.go b/service/waf/endpoints_test.go index 62b9911286c..0376547f942 100644 --- a/service/waf/endpoints_test.go +++ b/service/waf/endpoints_test.go @@ -9,9 +9,9 @@ import ( smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -60,14 +60,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -115,14 +113,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -154,14 +150,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -209,14 +203,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -248,14 +240,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -303,14 +293,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -342,14 +330,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -381,14 +367,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -420,14 +404,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -459,14 +441,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -498,14 +478,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -537,14 +515,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -576,14 +552,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -615,14 +589,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -674,14 +646,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -733,14 +703,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -792,14 +760,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -851,14 +817,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -891,14 +855,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -930,14 +892,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/waf/generated.json b/service/waf/generated.json index b0938e5e5cb..c4acb6c5637 100644 --- a/service/waf/generated.json +++ b/service/waf/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/waf/go.mod b/service/waf/go.mod index db25b70ef2d..1383a1aa72a 100644 --- a/service/waf/go.mod +++ b/service/waf/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/waf/go.sum b/service/waf/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/waf/go.sum +++ b/service/waf/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/wafregional/endpoints_test.go b/service/wafregional/endpoints_test.go index ff9d861e952..9458611cf3d 100644 --- a/service/wafregional/endpoints_test.go +++ b/service/wafregional/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1641,14 +1559,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1680,14 +1596,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1719,14 +1633,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1758,14 +1670,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1797,14 +1707,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1836,14 +1744,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1875,14 +1781,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1914,14 +1818,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1953,14 +1855,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1992,14 +1892,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2031,14 +1929,12 @@ func TestEndpointCase51(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2070,14 +1966,12 @@ func TestEndpointCase52(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2109,14 +2003,12 @@ func TestEndpointCase53(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2148,14 +2040,12 @@ func TestEndpointCase54(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2187,14 +2077,12 @@ func TestEndpointCase55(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2226,14 +2114,12 @@ func TestEndpointCase56(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2265,14 +2151,12 @@ func TestEndpointCase57(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2324,14 +2208,12 @@ func TestEndpointCase59(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2383,14 +2265,12 @@ func TestEndpointCase61(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2442,14 +2322,12 @@ func TestEndpointCase63(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2501,14 +2379,12 @@ func TestEndpointCase65(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2541,14 +2417,12 @@ func TestEndpointCase66(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2580,14 +2454,12 @@ func TestEndpointCase67(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/wafregional/generated.json b/service/wafregional/generated.json index 5c0af7b3a1a..14cea57322f 100644 --- a/service/wafregional/generated.json +++ b/service/wafregional/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/wafregional/go.mod b/service/wafregional/go.mod index e5d6b0e1f4c..e6f57f38269 100644 --- a/service/wafregional/go.mod +++ b/service/wafregional/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/wafregional/go.sum b/service/wafregional/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/wafregional/go.sum +++ b/service/wafregional/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/wafv2/endpoints_test.go b/service/wafv2/endpoints_test.go index 0be29170410..fa6a7526ba3 100644 --- a/service/wafv2/endpoints_test.go +++ b/service/wafv2/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1563,14 +1485,12 @@ func TestEndpointCase39(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1602,14 +1522,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1641,14 +1559,12 @@ func TestEndpointCase41(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1680,14 +1596,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1719,14 +1633,12 @@ func TestEndpointCase43(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1758,14 +1670,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1797,14 +1707,12 @@ func TestEndpointCase45(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1836,14 +1744,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1875,14 +1781,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1914,14 +1818,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1953,14 +1855,12 @@ func TestEndpointCase49(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1992,14 +1892,12 @@ func TestEndpointCase50(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2031,14 +1929,12 @@ func TestEndpointCase51(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2070,14 +1966,12 @@ func TestEndpointCase52(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2109,14 +2003,12 @@ func TestEndpointCase53(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2148,14 +2040,12 @@ func TestEndpointCase54(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2187,14 +2077,12 @@ func TestEndpointCase55(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2226,14 +2114,12 @@ func TestEndpointCase56(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2265,14 +2151,12 @@ func TestEndpointCase57(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2324,14 +2208,12 @@ func TestEndpointCase59(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2383,14 +2265,12 @@ func TestEndpointCase61(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2442,14 +2322,12 @@ func TestEndpointCase63(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2501,14 +2379,12 @@ func TestEndpointCase65(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2541,14 +2417,12 @@ func TestEndpointCase66(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -2580,14 +2454,12 @@ func TestEndpointCase67(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/wafv2/generated.json b/service/wafv2/generated.json index 901b13099b1..158a1f2b8a3 100644 --- a/service/wafv2/generated.json +++ b/service/wafv2/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/wafv2/go.mod b/service/wafv2/go.mod index 2e7bcd76b64..db0f31ef78a 100644 --- a/service/wafv2/go.mod +++ b/service/wafv2/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/wafv2/go.sum b/service/wafv2/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/wafv2/go.sum +++ b/service/wafv2/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/wellarchitected/endpoints_test.go b/service/wellarchitected/endpoints_test.go index 3038a3bf589..db49c48fdf7 100644 --- a/service/wellarchitected/endpoints_test.go +++ b/service/wellarchitected/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1193,14 +1135,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1252,14 +1192,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1311,14 +1249,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1370,14 +1306,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1410,14 +1344,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1449,14 +1381,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/wellarchitected/generated.json b/service/wellarchitected/generated.json index f84a82e5a84..62c30225a3e 100644 --- a/service/wellarchitected/generated.json +++ b/service/wellarchitected/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/wellarchitected/go.mod b/service/wellarchitected/go.mod index 55ae80ac072..088a0e30bc2 100644 --- a/service/wellarchitected/go.mod +++ b/service/wellarchitected/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/wellarchitected/go.sum b/service/wellarchitected/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/wellarchitected/go.sum +++ b/service/wellarchitected/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/wisdom/endpoints_test.go b/service/wisdom/endpoints_test.go index f8ade216c4c..965183b0889 100644 --- a/service/wisdom/endpoints_test.go +++ b/service/wisdom/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -725,14 +691,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -784,14 +748,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -843,14 +805,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -902,14 +862,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -942,14 +900,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/wisdom/generated.json b/service/wisdom/generated.json index 82980217fdf..3e30fe1db13 100644 --- a/service/wisdom/generated.json +++ b/service/wisdom/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/wisdom/go.mod b/service/wisdom/go.mod index 31d13150070..508ae268511 100644 --- a/service/wisdom/go.mod +++ b/service/wisdom/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/wisdom/go.sum b/service/wisdom/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/wisdom/go.sum +++ b/service/wisdom/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/workdocs/endpoints_test.go b/service/workdocs/endpoints_test.go index 5216c82c782..cd99b0256d9 100644 --- a/service/workdocs/endpoints_test.go +++ b/service/workdocs/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -764,14 +728,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -823,14 +785,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -882,14 +842,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -941,14 +899,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -981,14 +937,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1020,14 +974,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/workdocs/generated.json b/service/workdocs/generated.json index 21b5f6462b7..ef1791161f0 100644 --- a/service/workdocs/generated.json +++ b/service/workdocs/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/workdocs/go.mod b/service/workdocs/go.mod index 8b879a5c2f5..1831ce8ab24 100644 --- a/service/workdocs/go.mod +++ b/service/workdocs/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/workdocs/go.sum b/service/workdocs/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/workdocs/go.sum +++ b/service/workdocs/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/worklink/endpoints_test.go b/service/worklink/endpoints_test.go index d00b01eae2e..2efead54ede 100644 --- a/service/worklink/endpoints_test.go +++ b/service/worklink/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/worklink/generated.json b/service/worklink/generated.json index 2169efd2157..cd03dbc6350 100644 --- a/service/worklink/generated.json +++ b/service/worklink/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/worklink/go.mod b/service/worklink/go.mod index c6cf711741c..deee7f34f54 100644 --- a/service/worklink/go.mod +++ b/service/worklink/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/worklink/go.sum b/service/worklink/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/worklink/go.sum +++ b/service/worklink/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/workmail/endpoints_test.go b/service/workmail/endpoints_test.go index a5e7127e7cd..137c573c083 100644 --- a/service/workmail/endpoints_test.go +++ b/service/workmail/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -608,14 +580,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -667,14 +637,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -726,14 +694,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -785,14 +751,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -864,14 +826,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/workmail/generated.json b/service/workmail/generated.json index 42bcaa306aa..a03a6e8c607 100644 --- a/service/workmail/generated.json +++ b/service/workmail/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/workmail/go.mod b/service/workmail/go.mod index 5783ed07943..b1b9391bc44 100644 --- a/service/workmail/go.mod +++ b/service/workmail/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/workmail/go.sum b/service/workmail/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/workmail/go.sum +++ b/service/workmail/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/workmailmessageflow/endpoints_test.go b/service/workmailmessageflow/endpoints_test.go index 2e2bb400bc0..e378702fad4 100644 --- a/service/workmailmessageflow/endpoints_test.go +++ b/service/workmailmessageflow/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/workmailmessageflow/generated.json b/service/workmailmessageflow/generated.json index c6fa8e767be..d9bbb2b38d8 100644 --- a/service/workmailmessageflow/generated.json +++ b/service/workmailmessageflow/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/workmailmessageflow/go.mod b/service/workmailmessageflow/go.mod index 0baa1f2f0f4..107af6c6d70 100644 --- a/service/workmailmessageflow/go.mod +++ b/service/workmailmessageflow/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/workmailmessageflow/go.sum b/service/workmailmessageflow/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/workmailmessageflow/go.sum +++ b/service/workmailmessageflow/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/workspaces/endpoints_test.go b/service/workspaces/endpoints_test.go index 8c72544ddfd..1439caee4e6 100644 --- a/service/workspaces/endpoints_test.go +++ b/service/workspaces/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1154,14 +1098,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1213,14 +1155,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1272,14 +1212,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1332,14 +1270,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1371,14 +1307,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/workspaces/generated.json b/service/workspaces/generated.json index 86ea745097f..2a2924b982b 100644 --- a/service/workspaces/generated.json +++ b/service/workspaces/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/workspaces/go.mod b/service/workspaces/go.mod index 8eb9e0d988f..1479e82a984 100644 --- a/service/workspaces/go.mod +++ b/service/workspaces/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/workspaces/go.sum b/service/workspaces/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/workspaces/go.sum +++ b/service/workspaces/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/workspacesthinclient/endpoints_test.go b/service/workspacesthinclient/endpoints_test.go index 51503d404f3..09d4b966e1e 100644 --- a/service/workspacesthinclient/endpoints_test.go +++ b/service/workspacesthinclient/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -530,14 +506,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -589,14 +563,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -648,14 +620,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -707,14 +677,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -747,14 +715,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -786,14 +752,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/workspacesthinclient/generated.json b/service/workspacesthinclient/generated.json index f7c192fe273..537402b6bbe 100644 --- a/service/workspacesthinclient/generated.json +++ b/service/workspacesthinclient/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/workspacesthinclient/go.mod b/service/workspacesthinclient/go.mod index 5f340c3231a..2d9e4116827 100644 --- a/service/workspacesthinclient/go.mod +++ b/service/workspacesthinclient/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/workspacesthinclient/go.sum b/service/workspacesthinclient/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/workspacesthinclient/go.sum +++ b/service/workspacesthinclient/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/workspacesweb/endpoints_test.go b/service/workspacesweb/endpoints_test.go index 3b020506707..76988402de1 100644 --- a/service/workspacesweb/endpoints_test.go +++ b/service/workspacesweb/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -608,14 +580,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -667,14 +637,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -726,14 +694,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -785,14 +751,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -825,14 +789,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -864,14 +826,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/workspacesweb/generated.json b/service/workspacesweb/generated.json index 5fb35a58b8b..c61c3389ca3 100644 --- a/service/workspacesweb/generated.json +++ b/service/workspacesweb/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/workspacesweb/go.mod b/service/workspacesweb/go.mod index 868ea218637..ecf0f3346d2 100644 --- a/service/workspacesweb/go.mod +++ b/service/workspacesweb/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/workspacesweb/go.sum b/service/workspacesweb/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/workspacesweb/go.sum +++ b/service/workspacesweb/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/service/xray/endpoints_test.go b/service/xray/endpoints_test.go index 35f9cafba57..cfa2b6f7a75 100644 --- a/service/xray/endpoints_test.go +++ b/service/xray/endpoints_test.go @@ -7,9 +7,9 @@ import ( smithy "github.com/aws/smithy-go" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/ptr" - "github.com/google/go-cmp/cmp" "net/http" "net/url" + "reflect" "strings" "testing" ) @@ -42,14 +42,12 @@ func TestEndpointCase0(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -81,14 +79,12 @@ func TestEndpointCase1(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -120,14 +116,12 @@ func TestEndpointCase2(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -159,14 +153,12 @@ func TestEndpointCase3(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -198,14 +190,12 @@ func TestEndpointCase4(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -237,14 +227,12 @@ func TestEndpointCase5(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -276,14 +264,12 @@ func TestEndpointCase6(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -315,14 +301,12 @@ func TestEndpointCase7(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -354,14 +338,12 @@ func TestEndpointCase8(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -393,14 +375,12 @@ func TestEndpointCase9(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -432,14 +412,12 @@ func TestEndpointCase10(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -471,14 +449,12 @@ func TestEndpointCase11(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -510,14 +486,12 @@ func TestEndpointCase12(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -549,14 +523,12 @@ func TestEndpointCase13(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -588,14 +560,12 @@ func TestEndpointCase14(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -627,14 +597,12 @@ func TestEndpointCase15(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -666,14 +634,12 @@ func TestEndpointCase16(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -705,14 +671,12 @@ func TestEndpointCase17(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -744,14 +708,12 @@ func TestEndpointCase18(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -783,14 +745,12 @@ func TestEndpointCase19(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -822,14 +782,12 @@ func TestEndpointCase20(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -861,14 +819,12 @@ func TestEndpointCase21(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -900,14 +856,12 @@ func TestEndpointCase22(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -939,14 +893,12 @@ func TestEndpointCase23(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -978,14 +930,12 @@ func TestEndpointCase24(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1017,14 +967,12 @@ func TestEndpointCase25(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1056,14 +1004,12 @@ func TestEndpointCase26(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1095,14 +1041,12 @@ func TestEndpointCase27(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1134,14 +1078,12 @@ func TestEndpointCase28(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1173,14 +1115,12 @@ func TestEndpointCase29(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1212,14 +1152,12 @@ func TestEndpointCase30(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1251,14 +1189,12 @@ func TestEndpointCase31(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1290,14 +1226,12 @@ func TestEndpointCase32(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1329,14 +1263,12 @@ func TestEndpointCase33(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1368,14 +1300,12 @@ func TestEndpointCase34(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1407,14 +1337,12 @@ func TestEndpointCase35(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1446,14 +1374,12 @@ func TestEndpointCase36(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1485,14 +1411,12 @@ func TestEndpointCase37(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1524,14 +1448,12 @@ func TestEndpointCase38(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1583,14 +1505,12 @@ func TestEndpointCase40(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1642,14 +1562,12 @@ func TestEndpointCase42(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1701,14 +1619,12 @@ func TestEndpointCase44(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1760,14 +1676,12 @@ func TestEndpointCase46(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1800,14 +1714,12 @@ func TestEndpointCase47(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } @@ -1839,14 +1751,12 @@ func TestEndpointCase48(t *testing.T) { t.Errorf("expect %v URI, got %v", e, a) } - if diff := cmp.Diff(expectEndpoint.Headers, result.Headers); diff != "" { - t.Errorf("expect headers to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Headers, result.Headers) { + t.Errorf("expect headers to match\n%v != %v", expectEndpoint.Headers, result.Headers) } - if diff := cmp.Diff(expectEndpoint.Properties, result.Properties, - cmp.AllowUnexported(smithy.Properties{}), - ); diff != "" { - t.Errorf("expect properties to match\n%s", diff) + if !reflect.DeepEqual(expectEndpoint.Properties, result.Properties) { + t.Errorf("expect properties to match\n%v != %v", expectEndpoint.Properties, result.Properties) } } diff --git a/service/xray/generated.json b/service/xray/generated.json index 3a5fc5968b7..04faa84a1f8 100644 --- a/service/xray/generated.json +++ b/service/xray/generated.json @@ -3,8 +3,7 @@ "github.com/aws/aws-sdk-go-v2": "v1.4.0", "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000", "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000", - "github.com/aws/smithy-go": "v1.4.0", - "github.com/google/go-cmp": "v0.5.4" + "github.com/aws/smithy-go": "v1.4.0" }, "files": [ "api_client.go", diff --git a/service/xray/go.mod b/service/xray/go.mod index c8208839645..738a87e88e5 100644 --- a/service/xray/go.mod +++ b/service/xray/go.mod @@ -7,7 +7,6 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 github.com/aws/smithy-go v1.20.1 - github.com/google/go-cmp v0.5.8 ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/xray/go.sum b/service/xray/go.sum index 35ac695fb99..a0cddd7b526 100644 --- a/service/xray/go.sum +++ b/service/xray/go.sum @@ -1,4 +1,2 @@ github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=